merged fix from RC_0_16

2012-08-29 01:58:06 +00:00
parent f877c8b7f5
commit 33233963eb
2 changed files with 7 additions and 0 deletions
--- a/1
+++ b/1
@@ -3,6 +3,7 @@
 	* fix uTP edge case where udp socket buffer fills up
 	* fix nagle implementation in uTP

+	* fixed bug where setting upload slots to -1 would not mean infinite
 	* extend the UDP tracker protocol to include the request string from the tracker URL
 	* fix mingw build for linux crosscompiler