From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 4 May 2016 19:23:26 +0000 (-0400)
Subject: Merge branch 'bug18921_squashed' into maint-0.2.8
X-Git-Tag: tor-0.2.8.3-alpha~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01e7f42a09108e71cede46d4a038c4b1253a3d42;p=thirdparty%2Ftor.git

Merge branch 'bug18921_squashed' into maint-0.2.8
---

01e7f42a09108e71cede46d4a038c4b1253a3d42