From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 1 Dec 2017 14:34:47 +0000 (-0500)
Subject: Merge branch 'maint-0.2.5' into maint-0.2.8
X-Git-Tag: tor-0.2.9.15~30^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc3890439f156d4c79b153f13f7ecf3393362b29;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.5' into maint-0.2.8

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

dc3890439f156d4c79b153f13f7ecf3393362b29