merged RC_1_1 into master

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                 \

docs/index.rst

@@ -126,6 +126,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">
@@ -144,6 +150,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

include/libtorrent/session_handle.hpp

@@ -107,10 +107,10 @@ namespace libtorrent {
 			save_as_map TORRENT_DEPRECATED_ENUM =       0x040,
 			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
 		};
 

src/torrent.cpp

@@ -1920,6 +1920,7 @@ namespace libtorrent {
 
 		update_want_peers();
 
+		// this will remove the piece picker, if we're done with it
 		maybe_done_flushing();
 	}