merge of 'a5d2fae48cf001c84ff5cea42466e1f3ed7d5f0a'

and 'c52409bf5d7b422c23a62eecfa50b98d7c74f8df'
2012-01-17 03:04:52 +00:00
parent bafdaebc42 b1878d6026
commit 38dba5d19a
2 changed files with 11 additions and 4 deletions
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,8 @@
+2012-01-16 hottuna
+  * Router:
+    - Don't throttle tunnel creation if using a higher
+    - than default router.maxParticipatingTunnels setting.
+
 2012-01-16 zzz
  * Build: Put Implementation-Version in manifests
  * NetDB: Hopefully fix rare NPE (ticket #589)