summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-10-12 15:01:10 -0400
committerRoger Dingledine <arma@torproject.org>2009-10-12 15:01:10 -0400
commit27db67898503121a6223c73392dbcbb69edca4cd (patch)
tree93a283313f123d0da030a65d88e2d17c34232d38 /ChangeLog
parent6f95435f285eccf58616c939785e5783510c14c9 (diff)
downloadtor-27db67898503121a6223c73392dbcbb69edca4cd.tar.gz
tor-27db67898503121a6223c73392dbcbb69edca4cd.zip
move nickm's commit to the correct release
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog10
1 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 87548e81d0..72f4aa8456 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Changes in version 0.2.2.6-alpha - 2009-10-??
+ o Code simplifications and refactorings:
+ - Numerous changes, bugfixes, and workarounds from Nathan Freitas
+ to help Tor build correctly for Android phones.
+
+
Changes in version 0.2.2.5-alpha - 2009-10-11
o Major bugfixes:
- Make the tarball compile again. Oops. Bugfix on 0.2.2.4-alpha.
@@ -5,10 +11,6 @@ Changes in version 0.2.2.5-alpha - 2009-10-11
o New directory authorities:
- Move dizum to an alternate IP address.
- o Code simplifications and refactorings
- - Numerous changes, bugfixes, and workarounds from Nathan Freitas
- to help Tor build correctly for Android phones.
-
Changes in version 0.2.2.4-alpha - 2009-10-10
o Major bugfixes: