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

Merge branch 'maint-0.2.8'
---

8cae4abbacbda313081b1a567cb87d74bb9cea82