From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 16 Feb 2018 14:55:41 +0000 (-0500)
Subject: Merge branch 'maint-0.3.2' into maint-0.3.3
X-Git-Tag: tor-0.3.3.3-alpha~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6384d314fb47a088299a14b52e5f60b6e79697b4;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.2' into maint-0.3.3

"ours" merge to avoid taking 24902 a second time and having to reconcile
all the merge conflicts.
---

6384d314fb47a088299a14b52e5f60b6e79697b4