From f0d25510739bc543bc90b83bd001f4c77c3cd4d0 Mon Sep 17 00:00:00 2001
From: arvidn <arvid@cs.umu.se>
Date: Mon, 17 Jul 2017 22:59:40 -0700
Subject: [PATCH 1/3] add bitcoin donation button

---
 Makefile.am       |   1 +
 docs/bitcoin.png  | Bin 0 -> 3411 bytes
 docs/building.rst |   1 +
 docs/index.rst    |   7 +++++++
 4 files changed, 9 insertions(+)
 create mode 100644 docs/bitcoin.png

diff --git a/Makefile.am b/Makefile.am
index aa8bd6aa5..db095e026 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,7 @@ DOCS_IMAGES = \
   docs/disk_cache.png             \
   docs/utp_stack.diagram          \
   docs/utp_stack.png              \
+  docs/bitcoin.png                \
   docs/style.css                  \
   docs/rst.css                    \
   docs/img/bg.png                 \
diff --git a/docs/bitcoin.png b/docs/bitcoin.png
new file mode 100644
index 0000000000000000000000000000000000000000..af2f6b52cd3c4f1feb785f3313ab2b358860aa07
GIT binary patch
literal 3411
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

literal 0
HcmV?d00001

diff --git a/docs/building.rst b/docs/building.rst
index dc6706495..f31866716 100644
--- a/docs/building.rst
+++ b/docs/building.rst
@@ -286,6 +286,7 @@ Build features:
 | ``openssl-version``      | This can be used on windows to link against the    |
 |                          | special OpenSSL library names used on windows      |
 |                          | prior to OpenSSL 1.1.                              |
+|                          |                                                    |
 |                          | * ``1.1`` - link against the normal openssl        |
 |                          |   library name. (default)                          |
 |                          | * ``pre1.1`` - link against the old windows names  |
diff --git a/docs/index.rst b/docs/index.rst
index 03c36b8ed..e6fbd2cb3 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -124,6 +124,12 @@ See the contribute_ page for other ways to help out.
 
 .. raw:: html
 
+	<span style="display:block;text-align:center;">
+	<img src="bitcoin.png" style="display:inline"><br/>
+	<a href="bitcoin:373ZDeQgQSQNuxdinNAPnQ63CRNn4iEXzg">bitcoin:373ZDeQgQSQNuxdinNAPnQ63CRNn4iEXzg</a>
+	</span>
+	
+	<span style="display:block;text-align:center;margin-top:1em">
 	<span style="display:inline-block">
 	<a class="FlattrButton" style="display:none;" href="http://libtorrent.org"></a>
 	<noscript><a href="https://flattr.com/thing/95662/libtorrent" target="_blank">
@@ -142,6 +148,7 @@ See the contribute_ page for other ways to help out.
 	<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
 	</form>
 	</span>
+	</span>
 
 
 Support

From cedd468300edf658554a2ad50ca78609c5a307f0 Mon Sep 17 00:00:00 2001
From: arvidn <arvid@cs.umu.se>
Date: Fri, 21 Jul 2017 18:33:27 -0700
Subject: [PATCH 2/3] backport fix to clearing of piece picker in
 suggest_read_cache mode

---
 src/torrent.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/torrent.cpp b/src/torrent.cpp
index 54a9dfac7..69204864f 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -2138,6 +2138,7 @@ namespace libtorrent
 
 		update_want_peers();
 
+		// this will remove the piece picker, if we're done with it
 		maybe_done_flushing();
 	}
 
@@ -8668,18 +8669,20 @@ namespace libtorrent
 	void torrent::maybe_done_flushing()
 	{
 		if (!has_picker()) return;
-
-		// when we're suggesting read cache pieces, we
-		// still need the piece picker, to keep track
-		// of availability counts for pieces
-		if (m_picker->is_seeding()
-			&& settings().get_int(settings_pack::suggest_mode) != settings_pack::suggest_read_cache)
+		if (m_picker->is_seeding())
 		{
 			// no need for the piece picker anymore
-			m_picker.reset();
+
+			// when we're suggesting read cache pieces, we
+			// still need the piece picker, to keep track
+			// of availability counts for pieces
+			if (settings().get_int(settings_pack::suggest_mode) != settings_pack::suggest_read_cache)
+			{
+				m_picker.reset();
+				m_file_progress.clear();
+			}
 			m_have_all = true;
 			update_gauge();
-			m_file_progress.clear();
 		}
 	}
 

From 972f179a5c83ac2f8c789e82f6d1e9867e4fffc6 Mon Sep 17 00:00:00 2001
From: Johan Gunnarsson <johan.gunnarsson@gmail.com>
Date: Thu, 27 Jul 2017 15:25:47 +0200
Subject: [PATCH 3/3] Stop using deprecated save_proxy in header files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without this patch, compiler will warn about save_proxy being used by merely
including session_handle.hpp:

/tmp/include/libtorrent/session_handle.hpp:104:45: warning: ‘save_proxy’ is deprecated [-Wdeprecated-declarations]
    save_dht_proxy TORRENT_DEPRECATED_ENUM = save_proxy,
                                             ^~~~~~~~~~
/tmp/include/libtorrent/session_handle.hpp:102:4: note: declared here
    save_proxy TORRENT_DEPRECATED_ENUM =        0x008,
    ^~~~~~~~~~
/tmp/include/libtorrent/session_handle.hpp:105:46: warning: ‘save_proxy’ is deprecated [-Wdeprecated-declarations]
    save_peer_proxy TORRENT_DEPRECATED_ENUM = save_proxy,
                                              ^~~~~~~~~~
/tmp/include/libtorrent/session_handle.hpp:102:4: note: declared here
    save_proxy TORRENT_DEPRECATED_ENUM =        0x008,
    ^~~~~~~~~~
/tmp/include/libtorrent/session_handle.hpp:106:45: warning: ‘save_proxy’ is deprecated [-Wdeprecated-declarations]
    save_web_proxy TORRENT_DEPRECATED_ENUM = save_proxy,
                                             ^~~~~~~~~~
/tmp/include/libtorrent/session_handle.hpp:102:4: note: declared here
    save_proxy TORRENT_DEPRECATED_ENUM =        0x008,
    ^~~~~~~~~~
/tmp/include/libtorrent/session_handle.hpp:107:49: warning: ‘save_proxy’ is deprecated [-Wdeprecated-declarations]
    save_tracker_proxy TORRENT_DEPRECATED_ENUM = save_proxy
                                                 ^~~~~~~~~~
/tmp/include/libtorrent/session_handle.hpp:102:4: note: declared here
    save_proxy TORRENT_DEPRECATED_ENUM =        0x008,
    ^~~~~~~~~~
---
 include/libtorrent/session_handle.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/libtorrent/session_handle.hpp b/include/libtorrent/session_handle.hpp
index a809cdb7e..3d9caefd1 100644
--- a/include/libtorrent/session_handle.hpp
+++ b/include/libtorrent/session_handle.hpp
@@ -101,10 +101,10 @@ namespace libtorrent
 			save_feeds TORRENT_DEPRECATED_ENUM =        0x080,
 			save_proxy TORRENT_DEPRECATED_ENUM =        0x008,
 			save_i2p_proxy TORRENT_DEPRECATED_ENUM =    0x010,
-			save_dht_proxy TORRENT_DEPRECATED_ENUM = save_proxy,
-			save_peer_proxy TORRENT_DEPRECATED_ENUM = save_proxy,
-			save_web_proxy TORRENT_DEPRECATED_ENUM = save_proxy,
-			save_tracker_proxy TORRENT_DEPRECATED_ENUM = save_proxy
+			save_dht_proxy TORRENT_DEPRECATED_ENUM = 0x008, // save_proxy
+			save_peer_proxy TORRENT_DEPRECATED_ENUM = 0x008, // save_proxy
+			save_web_proxy TORRENT_DEPRECATED_ENUM = 0x008, // save_proxy
+			save_tracker_proxy TORRENT_DEPRECATED_ENUM = 0x008 // save_proxy
 #endif
 		};