From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 17 May 2016 15:09:54 +0000 (-0400)
Subject: Merge branch 'bug18616-v4-merged_028' into maint-0.2.8
X-Git-Tag: tor-0.2.8.3-alpha~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6a2fec05ebcc39773a2f6666e1378410c64f047;p=thirdparty%2Ftor.git

Merge branch 'bug18616-v4-merged_028' into maint-0.2.8
---

d6a2fec05ebcc39773a2f6666e1378410c64f047