From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 24 Oct 2017 13:10:04 +0000 (-0400)
Subject: Merge branch 'maint-0.2.5' into maint-0.2.8
X-Git-Tag: tor-0.2.8.16~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=912ebf165f6a3e7385118cf78a4107f25b0ad5de;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.5' into maint-0.2.8

"ours" merge to avoid version bump
---

912ebf165f6a3e7385118cf78a4107f25b0ad5de