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

Merge branch 'maint-0.2.8'
---

fb9c9e04f002fbbd9745911a17481b49ed66c9f4