From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 17 May 2016 23:48:49 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~232
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7f6e434be6aa402153af0c6dd3238c58e35ed27;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

a7f6e434be6aa402153af0c6dd3238c58e35ed27