From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 22 Sep 2016 13:00:37 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.3-alpha~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6deeedb5e09fc0998ab5d4e2fc53415bc6dc5c39;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

6deeedb5e09fc0998ab5d4e2fc53415bc6dc5c39