From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 2 May 2016 18:02:15 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~275
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8340becd39920ef6363ab6c7d494cc7abf70c202;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

8340becd39920ef6363ab6c7d494cc7abf70c202