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

Merge branch 'maint-0.2.8'
---

dcc4fd440392eec3dd8796c9c759faed51a61db0