From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 27 May 2016 01:09:22 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~206
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a93b6bbf17f8940a2b5cb9faad2ee054c85297c1;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'

(This is an "ours" merge to avoid taking the version bump)
---

a93b6bbf17f8940a2b5cb9faad2ee054c85297c1