From: Nick Mathewson Date: Wed, 11 May 2016 16:28:37 +0000 (-0400) Subject: Merge remote-tracking branch 'teor/bug18816-squashed' into maint-0.2.8 X-Git-Tag: tor-0.2.8.3-alpha~33 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e71dfb6344c0480523a1fef0a77bd3d270d62e26;p=thirdparty%2Ftor.git Merge remote-tracking branch 'teor/bug18816-squashed' into maint-0.2.8 --- e71dfb6344c0480523a1fef0a77bd3d270d62e26