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

Merge branch 'maint-0.2.8'
---

9c7edb0f3edd2dec30f10e195f7bcc12a4005f30