summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2014-05-14 16:04:16 -0400
committerRoger Dingledine <arma@torproject.org>2014-05-14 16:04:16 -0400
commita7d700aa04f2869bc0271f3ed9677d36093810be (patch)
treeeb5e3d4f029976f5f7d28aee0cab64e0b2d71fb3
parent9aba2117e2a6894a6bfac62b4cbc57786b7a83db (diff)
downloadtor-a7d700aa04f2869bc0271f3ed9677d36093810be.tar.gz
tor-a7d700aa04f2869bc0271f3ed9677d36093810be.zip
match the changelog entries from 0.2.5.x when possible
-rw-r--r--ChangeLog6
1 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5dddae2333..96cb28c0aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,7 +46,7 @@ Changes in version 0.2.4.22 - 2014-05-1?
bugfix on 0.2.1.1-alpha.
o Minor bugfixes (controller, backport from 0.2.5.4-alpha):
- - Avoid sending an garbage value to the controller when a circuit is
+ - Avoid sending a garbage value to the controller when a circuit is
cannibalized. Fixes bug 11519; bugfix on 0.2.3.11-alpha.
o Minor bugfixes (exit relay, backport from 0.2.5.4-alpha):
@@ -85,8 +85,8 @@ Changes in version 0.2.4.22 - 2014-05-1?
o Documentation (backport from 0.2.5.4-alpha):
- Correctly document that we search for a system torrc file before
- looking in ~/.torrc. Fixes documentation side of 9213; bugfix
- on 0.2.3.18-rc.
+ looking in ~/.torrc. Fixes documentation side of 9213; bugfix on
+ 0.2.3.18-rc.
Changes in version 0.2.4.21 - 2014-02-28