From: Roger Dingledine Date: Wed, 11 Jan 2012 01:26:50 +0000 (-0500) Subject: Merge branch 'maint-0.2.2' into release-0.2.2 X-Git-Tag: tor-0.2.2.36~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cd68895fb373cc10825368ecfa345a100da7ac4;p=thirdparty%2Ftor.git Merge branch 'maint-0.2.2' into release-0.2.2 --- 6cd68895fb373cc10825368ecfa345a100da7ac4