From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 9 Aug 2017 00:31:57 +0000 (-0400)
Subject: Merge branch 'ticket20657_nickm_bugfixes_squashed'
X-Git-Tag: tor-0.3.2.1-alpha~171
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34e4122025791d1a607426e5e543d6312872b9dd;p=thirdparty%2Ftor.git

Merge branch 'ticket20657_nickm_bugfixes_squashed'
---

34e4122025791d1a607426e5e543d6312872b9dd