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

Merge branch 'maint-0.2.8'
---

e9e6a1f54781bab186e8c107c2e496d7786ab096