From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 1 Dec 2017 14:35:36 +0000 (-0500)
Subject: Merge branch 'maint-0.3.2'
X-Git-Tag: tor-0.3.3.1-alpha~170
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66e99096b32e4b10620eef40a66228b027a54106;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.2'

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

66e99096b32e4b10620eef40a66228b027a54106