aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2013-09-04 23:44:39 -0400
committerRoger Dingledine <arma@torproject.org>2013-09-04 23:44:39 -0400
commit6156887adfa724805f90b3b7cf2be6213f08a450 (patch)
tree0aadbdae3ed165be0b8249a07811feb86a4bf267 /changes
parentd5e9573ed24df7c0eb795617de9db2a0c3e40b4d (diff)
parentc6f1668db3010de6aed22bd87850aa846911d43b (diff)
downloadtor-6156887adfa724805f90b3b7cf2be6213f08a450.tar.gz
tor-6156887adfa724805f90b3b7cf2be6213f08a450.zip
Merge branch 'maint-0.2.4'
Conflicts: src/test/test.c
Diffstat (limited to 'changes')
-rw-r--r--changes/feature95747
1 files changed, 7 insertions, 0 deletions
diff --git a/changes/feature9574 b/changes/feature9574
new file mode 100644
index 0000000000..723606e396
--- /dev/null
+++ b/changes/feature9574
@@ -0,0 +1,7 @@
+ o Major features:
+ - Relays now process the new "NTor" circuit-level handshake requests
+ with higher priority than the old "TAP" circuit-level handshake
+ requests. We still process some TAP requests to not totally starve
+ 0.2.3 clients when NTor becomes popular. A new consensus parameter
+ "NumNTorsPerTAP" lets us tune the balance later if we need to.
+ Implements ticket 9574.