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

Merge branch 'maint-0.2.8'
---

6a011645381745ecb6f798b332124c4c95b6b0c1