From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 2 Jun 2016 14:13:35 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~190
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b458a81cc501fb56d72f3312b8b407f9be323e9b;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

b458a81cc501fb56d72f3312b8b407f9be323e9b