From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 12 Apr 2016 17:02:37 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~292
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eafcd7b0fccb0993d6c8bcaabc40231d0bdb5289;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

eafcd7b0fccb0993d6c8bcaabc40231d0bdb5289