merge fix from RC_0_16

2013-07-26 16:59:10 +00:00
parent 7cbd54b327
commit 1cb0161f0e
3 changed files with 44 additions and 9 deletions
--- a/1
+++ b/1
@@ -23,6 +23,7 @@
 	* fix uTP edge case where udp socket buffer fills up
 	* fix nagle implementation in uTP

+	* introduce bandwidth exhaustion attack-mitigation in allowed-fast pieces
 	* python binding fix issue where torrent_info objects where destructing when their torrents were deleted
 	* added missing field to scrape_failed_alert in python bindings
 	* GCC 4.8 fix