summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2013-09-04 23:57:35 -0400
committerRoger Dingledine <arma@torproject.org>2013-09-04 23:57:35 -0400
commit63b91189e0c3c278735f9ec9662739929138e228 (patch)
tree89bd2485edbd1db7c7bce1377d455cc1d6db3ad1
parent6cf02b9ad6c937c84c9a43ef6181863275b90df4 (diff)
downloadtor-63b91189e0c3c278735f9ec9662739929138e228.tar.gz
tor-63b91189e0c3c278735f9ec9662739929138e228.zip
fold in recent changes entries
-rw-r--r--ChangeLog18
-rw-r--r--changes/bug94007
-rw-r--r--changes/bug9671_0235
-rw-r--r--changes/feature95747
4 files changed, 18 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 95ce51975f..427ded3bb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
Changes in version 0.2.4.17-rc - 2013-09-0x
+
+ 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.
+
o Major bugfixes:
+ - If the circuit build timeout logic is disabled (via the consensus,
+ or because we are an authority), then don't build testing circuits.
+ Fixes bug 9657; bugfix on 0.2.2.14-alpha.
- Bridges now send AUTH_CHALLENGE cells during their v3 handshakes;
previously they did not, which prevented them from receiving
successful connections from relays for self-test or bandwidth
@@ -12,6 +24,12 @@ Changes in version 0.2.4.17-rc - 2013-09-0x
next microdescriptor networkstatus. Fixes bug 9564; bugfix on
0.2.3.14-alpha.
+ o Minor bugfixes:
+ - Avoid double-closing the listener socket in our socketpair
+ replacement (used on Windows) in the case where the addresses on
+ our opened sockets don't match what we expected. Fixes bug 9400;
+ bugfix on every released Tor version. Found by Coverity.
+
o Minor fixes (config options):
- Avoid overflows when the user sets MaxCircuitDirtiness to a
ridiculously high value, by imposing a (ridiculously high) 30-day
diff --git a/changes/bug9400 b/changes/bug9400
deleted file mode 100644
index 974224068a..0000000000
--- a/changes/bug9400
+++ /dev/null
@@ -1,7 +0,0 @@
- o Minor bugfixes:
-
- - Avoid double-closing the listener socket in our socketpair replacement
- (used on Windows) in the case where the addresses on our opened
- sockets don't match what we expected. Fixes bug 9400; bugfix on
- every released Tor version. Found by Coverity.
-
diff --git a/changes/bug9671_023 b/changes/bug9671_023
deleted file mode 100644
index 035ca5cdea..0000000000
--- a/changes/bug9671_023
+++ /dev/null
@@ -1,5 +0,0 @@
- o Major bugfixes:
- - If the circuit build timeout logic is disabled (via the consensus,
- or because we are an authority), then don't build testing circuits.
- Fixes bug 9657; bugfix on 0.2.2.14-alpha.
-
diff --git a/changes/feature9574 b/changes/feature9574
deleted file mode 100644
index 723606e396..0000000000
--- a/changes/feature9574
+++ /dev/null
@@ -1,7 +0,0 @@
- 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.