From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 11 Aug 2017 16:11:42 +0000 (-0400)
Subject: Merge branch 'bug18982'
X-Git-Tag: tor-0.3.2.1-alpha~162
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a368cadf9514cf31deebed8613c4fd833b1448bf;p=thirdparty%2Ftor.git

Merge branch 'bug18982'
---

a368cadf9514cf31deebed8613c4fd833b1448bf