From: Roger Dingledine Date: Thu, 2 Feb 2012 07:33:03 +0000 (-0500) Subject: Merge branch 'maint-0.2.2' into release-0.2.2 X-Git-Tag: tor-0.2.2.36~15 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=121ae29ed952a7203f0d96a60fef2f52d5cae23e;p=thirdparty%2Ftor.git Merge branch 'maint-0.2.2' into release-0.2.2 --- 121ae29ed952a7203f0d96a60fef2f52d5cae23e