From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 1 Mar 2018 21:44:18 +0000 (-0500)
Subject: Merge branch 'maint-0.3.3'
X-Git-Tag: tor-0.3.4.1-alpha~254
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f1fe29e8de32e3651d92a296fbc81e50f5e740c;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.3'

"ours" to avoid version bump.
---

6f1fe29e8de32e3651d92a296fbc81e50f5e740c