From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 29 Jun 2017 20:36:58 +0000 (-0400)
Subject: Merge branch 'maint-0.3.1'
X-Git-Tag: tor-0.3.2.1-alpha~277
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb33bcbcf0fff2f5d6fa29d1097a943b1a764572;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.1'

"ours" merge to avoid version bump.
---

fb33bcbcf0fff2f5d6fa29d1097a943b1a764572