From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 8 Jun 2017 13:28:11 +0000 (-0400)
Subject: Merge branch 'maint-0.2.4' into maint-0.2.5
X-Git-Tag: tor-0.2.5.14~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77c5d8c73856da7f07508fc263685717bd88dbc7;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.4' into maint-0.2.5

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

77c5d8c73856da7f07508fc263685717bd88dbc7