From: Roger Dingledine Date: Thu, 5 Jan 2012 23:28:27 +0000 (-0500) Subject: Merge branch 'maint-0.2.2' into release-0.2.2 X-Git-Tag: tor-0.2.2.36~20 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43454a872efbc09d35c7bdaf0aef1bd493b01165;p=thirdparty%2Ftor.git Merge branch 'maint-0.2.2' into release-0.2.2 --- 43454a872efbc09d35c7bdaf0aef1bd493b01165