From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 25 May 2016 13:27:47 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~213
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3ec811c2ee801bf6dd3d7f65c4997470e807c9d;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

a3ec811c2ee801bf6dd3d7f65c4997470e807c9d