From: Nick Mathewson Date: Thu, 21 Oct 2010 20:11:02 +0000 (-0400) Subject: Merge branch 'bug988-nm' into maint-0.2.2 X-Git-Tag: tor-0.2.2.18-alpha~22 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1587735c90f62799e34bc30b1a99eaef6b67dbaa;p=thirdparty%2Ftor.git Merge branch 'bug988-nm' into maint-0.2.2 --- 1587735c90f62799e34bc30b1a99eaef6b67dbaa