From: Roger Dingledine Date: Sat, 21 May 2011 20:09:55 +0000 (-0400) Subject: Merge branch 'bug1810' into maint-0.2.2 X-Git-Tag: tor-0.2.2.28-beta~10^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0235fe34d2c915f46933ead253192b042c713af0;p=thirdparty%2Ftor.git Merge branch 'bug1810' into maint-0.2.2 --- 0235fe34d2c915f46933ead253192b042c713af0