From: Roger Dingledine Date: Fri, 17 Dec 2010 00:24:19 +0000 (-0500) Subject: Merge branch 'maint-0.2.2' into release-0.2.2 X-Git-Tag: tor-0.2.2.20-alpha^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aae58deb2cdcaad0ccfbccf26be83a79aad41efa;p=thirdparty%2Ftor.git Merge branch 'maint-0.2.2' into release-0.2.2 --- aae58deb2cdcaad0ccfbccf26be83a79aad41efa