From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 7 Apr 2016 14:46:15 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~295
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7034847225b1ca39dfb122e04006728d31f8db6;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

e7034847225b1ca39dfb122e04006728d31f8db6