From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 9 Mar 2016 15:37:00 +0000 (-0500)
Subject: Merge branch 'maint-0.2.7'
X-Git-Tag: tor-0.2.8.2-alpha~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58bcae37a2c63db81c8c0f8fdf47d886f072209a;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.7'
---

58bcae37a2c63db81c8c0f8fdf47d886f072209a