From: Roger Dingledine Date: Sun, 8 Jan 2012 17:17:03 +0000 (-0500) Subject: Merge branch 'maint-0.2.2' into release-0.2.2 X-Git-Tag: tor-0.2.2.36~17 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a77d5324fe0686cdc70676361c1f90ff533f8fd;p=thirdparty%2Ftor.git Merge branch 'maint-0.2.2' into release-0.2.2 --- 0a77d5324fe0686cdc70676361c1f90ff533f8fd