From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 15 Jun 2016 16:55:54 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~163
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4bcec3bab5b0f93934bfe67093146c7a77fa724f;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'

'ours' merge to avoid bumping version.
---

4bcec3bab5b0f93934bfe67093146c7a77fa724f