From: Nick Mathewson Date: Tue, 7 Dec 2010 16:35:49 +0000 (-0500) Subject: Merge branch 'bug2081_followup_022' into maint-0.2.2 X-Git-Tag: tor-0.2.2.20-alpha~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f924fbf19f1244eed568bc799f77d8fb288c801d;p=thirdparty%2Ftor.git Merge branch 'bug2081_followup_022' into maint-0.2.2 --- f924fbf19f1244eed568bc799f77d8fb288c801d