From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 5 Mar 2017 04:16:29 +0000 (-0500)
Subject: Merge branch 'bug21599_squashed'
X-Git-Tag: tor-0.3.1.1-alpha~238
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=958ec0f5f877b84d8519102cc0b5b55583a15144;p=thirdparty%2Ftor.git

Merge branch 'bug21599_squashed'
---

958ec0f5f877b84d8519102cc0b5b55583a15144