From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 6 Oct 2016 13:59:49 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.4-alpha~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7410adb330ae71ee70a63dfb76a3c446ff9e28f4;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

7410adb330ae71ee70a63dfb76a3c446ff9e28f4