summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2011-09-13 20:26:32 -0400
committerRoger Dingledine <arma@torproject.org>2011-09-13 20:26:32 -0400
commit5f4f727d58daa194656ec43880a6151e88f5c0a2 (patch)
treed2dd19d514cf09ab205a5bf7c746f90400923e1e
parent0b0f7d792c02fdfc664f655b28ad25a4ece6baa1 (diff)
downloadtor-5f4f727d58daa194656ec43880a6151e88f5c0a2.tar.gz
tor-5f4f727d58daa194656ec43880a6151e88f5c0a2.zip
slight tweak to unify thingstor-0.2.3.4-alpha
-rw-r--r--ChangeLog4
1 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 75a8759830..5381cf8813 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,7 +33,7 @@ Changes in version 0.2.3.4-alpha - 2011-09-13
consensus flag. Related to bug 2649.
- Update to the September 6 2011 Maxmind GeoLite Country database.
- o Minor bugfixes (also in 0.2.2.33):
+ o Minor bugfixes (also part of 0.2.2.33):
- Demote the 'replay detected' log message emitted when a hidden
service receives the same Diffie-Hellman public key in two different
INTRODUCE2 cells to info level. A normal Tor client can cause that
@@ -49,7 +49,7 @@ Changes in version 0.2.3.4-alpha - 2011-09-13
given the impression that every ASCII character between "+" and "_"
was permitted. Now we say "[A-Za-z0-9+_-]". Bugfix on 0.2.1.5-alpha.
- o Build fixes (also in 0.2.2.33):
+ o Build fixes (also part of 0.2.2.33):
- Clean up some code issues that prevented Tor from building on older
BSDs. Fixes bug 3894; reported by "grarpamp".
- Search for a platform-specific version of "ar" when cross-compiling.