From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 7 Apr 2017 17:21:15 +0000 (-0400)
Subject: Merge branch 'ticket21842_squashed'
X-Git-Tag: tor-0.3.1.1-alpha~175
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0fa7dcdf048b418640d2e624e5b111ed1956214;p=thirdparty%2Ftor.git

Merge branch 'ticket21842_squashed'
---

f0fa7dcdf048b418640d2e624e5b111ed1956214