From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 23 Jun 2017 13:28:27 +0000 (-0400)
Subject: Merge branch 'bug3056_squashed'
X-Git-Tag: tor-0.3.2.1-alpha~304
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80360ed9fa86c22ee3f9cf7e14076ef64466918a;p=thirdparty%2Ftor.git

Merge branch 'bug3056_squashed'
---

80360ed9fa86c22ee3f9cf7e14076ef64466918a