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

Merge branch 'maint-0.2.8'
---

7bc9d1e00204c5f11ccf81a9eeca3efaead63cc9