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

Merge branch 'maint-0.2.8'
---

20d39e86afa37c2a7008c48f97c3ffd298441808