From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 31 Mar 2014 15:57:56 +0000 (-0400)
Subject: Merge branch 'bug8787_squashed'
X-Git-Tag: tor-0.2.5.4-alpha~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c0441cca8b483882f5676b98081f0fe4b52d3ae1;p=thirdparty%2Ftor.git

Merge branch 'bug8787_squashed'
---

c0441cca8b483882f5676b98081f0fe4b52d3ae1