From: Roger Dingledine Date: Thu, 10 May 2012 21:57:16 +0000 (-0400) Subject: Merge branch 'maint-0.2.2' into release-0.2.2 X-Git-Tag: tor-0.2.2.36~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0daad3e44d609b451173d1fdbbb39f28f2d1d461;p=thirdparty%2Ftor.git Merge branch 'maint-0.2.2' into release-0.2.2 --- 0daad3e44d609b451173d1fdbbb39f28f2d1d461