From: Nick Mathewson Date: Fri, 1 Jul 2011 16:55:27 +0000 (-0400) Subject: Merge branch 'cid30_changelog' into maint-0.2.2 X-Git-Tag: tor-0.2.2.30-rc~8^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5cf725e3c691ac3e5674ce64bd2be410a9cb0ede;p=thirdparty%2Ftor.git Merge branch 'cid30_changelog' into maint-0.2.2 --- 5cf725e3c691ac3e5674ce64bd2be410a9cb0ede