From: Nick Mathewson Date: Wed, 7 Jan 2015 16:54:33 +0000 (-0500) Subject: Merge remote-tracking branch 'public/bug12985_024' into bug12985_025 X-Git-Tag: tor-0.2.6.3-alpha~191^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=139a1c64a0333d7a2af6715e827d5858628683f4;p=thirdparty%2Ftor.git Merge remote-tracking branch 'public/bug12985_024' into bug12985_025 --- 139a1c64a0333d7a2af6715e827d5858628683f4