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

Merge branch 'maint-0.2.8'

"ours" commit to avoid bumping version.
---

6e823a27f114523c566b99a4deb3900764570954