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

Merge branch 'maint-0.2.8'

("ours" merge to avoid taking version bump)
---

3b6f924e507d15fc7290649738048db9c79ec70d