From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 15 Feb 2017 12:51:48 +0000 (-0500)
Subject: Merge branch 'maint-0.2.7' of git-rw.torproject.org:/tor into maint-0.2.7
X-Git-Tag: tor-0.2.8.13~7^2^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67877f55add6022c024952d453043b0cb59b75d7;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.7' of git-rw.torproject.org:/tor into maint-0.2.7
---

67877f55add6022c024952d453043b0cb59b75d7