merged fix from RC_0_16

2013-01-21 18:54:45 +00:00
parent 2f995f77a8
commit a301d119fa
3 changed files with 28 additions and 1 deletions
--- a/1
+++ b/1
@@ -10,6 +10,7 @@
 	* fix uTP edge case where udp socket buffer fills up
 	* fix nagle implementation in uTP

+	* fix string encoding conversions on windows
 	* take torrent_handle::query_pieces into account in torrent_handle::statue()
 	* honor trackers responding with 410
 	* fixed merkle tree torrent creation bug