From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 26 May 2016 16:30:03 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~208
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a38dfc7f29392b919c1a1d9ddb6075eec311d9c3;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'

(Ours merge, to avoid taking version bump)
---

a38dfc7f29392b919c1a1d9ddb6075eec311d9c3