commit a7d700aa04f2869bc0271f3ed9677d36093810be Author: Roger Dingledine <arma@torproject.org> Date: Wed May 14 16:04:16 2014 -0400 match the changelog entries from 0.2.5.x when possible --- ChangeLog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5dddae2..96cb28c 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