From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 8 Dec 2016 16:03:08 +0000 (-0500)
Subject: Merge branch 'maint-0.2.8' into maint-0.2.9
X-Git-Tag: tor-0.2.9.7-rc~11^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9636ebc2f70544f8b86eb7e3a86a85c81349f8e;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8' into maint-0.2.9

"Ours" merge to avoid bumping version.
---

f9636ebc2f70544f8b86eb7e3a86a85c81349f8e