From 5e54d13dec93368884a59c7633b1fe66155e2512 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Thu, 7 Aug 2014 05:00:29 +0000
Subject: [PATCH] merge fixes from RC_0_16

---
 ChangeLog       | 2 ++
 src/torrent.cpp | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index be8fc6ecf..cc367c157 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -93,6 +93,8 @@
 	* fix uTP edge case where udp socket buffer fills up
 	* fix nagle implementation in uTP
 
+	* suppress initial 'completed' announce to trackers added with replace_trackers
+	  after becoming a seed
 	* SOCKS4 fix for trying to connect over IPv6
 	* fix saving resume data when removing all trackers
 	* fix bug in udp_socket when changing socks5 proxy quickly
diff --git a/src/torrent.cpp b/src/torrent.cpp
index 2e769947f..0905ffa67 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -5521,7 +5521,10 @@ namespace libtorrent
 		m_last_working_tracker = -1;
 		for (std::vector<announce_entry>::iterator i = m_trackers.begin()
 			, end(m_trackers.end()); i != end; ++i)
+		{
 			if (i->source == 0) i->source = announce_entry::source_client;
+			i->complete_sent = is_seed();
+		}
 
 		if (settings().get_bool(settings_pack::prefer_udp_trackers))
 			prioritize_udp_trackers();