From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 15 Jun 2016 00:36:54 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~166
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=657067ef9d89c5dd62036e3df78b4bdf62130f42;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'

This is an "ours" merge to avoid taking a version bump.
---

657067ef9d89c5dd62036e3df78b4bdf62130f42