From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 5 Feb 2016 13:13:47 +0000 (-0500)
Subject: Merge branch 'maint-0.2.7'
X-Git-Tag: tor-0.2.8.2-alpha~151
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f5cdf2b6c72ae89eea630a2c4693273ff1aee6c;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.7'
---

1f5cdf2b6c72ae89eea630a2c4693273ff1aee6c