From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 5 May 2016 12:25:27 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~269
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=641cdc345c7a0e8123cee9a7b3864b63ba389afa;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

641cdc345c7a0e8123cee9a7b3864b63ba389afa