From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 24 Aug 2017 13:18:03 +0000 (-0400)
Subject: Merge branch 'bug22677'
X-Git-Tag: tor-0.3.2.1-alpha~151
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53c82c0821737ce76bb99a75b5f309d0b2d715ba;p=thirdparty%2Ftor.git

Merge branch 'bug22677'
---

53c82c0821737ce76bb99a75b5f309d0b2d715ba