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

Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump
---

725f2371042b36c151a42e575a5b319d3820126c