From: Nick Mathewson Date: Sun, 15 May 2011 15:17:54 +0000 (-0400) Subject: Merge branch 'bug2732-simpler' into maint-0.2.2 X-Git-Tag: tor-0.2.3.2-alpha~123^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=228b77f64e3d545e9d4dac2adc845ecd929c4ac5;p=thirdparty%2Ftor.git Merge branch 'bug2732-simpler' into maint-0.2.2 --- 228b77f64e3d545e9d4dac2adc845ecd929c4ac5