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

Merge branch 'maint-0.2.8'
---

7fa11a92d59cea60403b918c4fa9cf3dab6aefb3