From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 14 Dec 2015 20:45:54 +0000 (-0500)
Subject: Merge branch 'maint-0.2.7'
X-Git-Tag: tor-0.2.8.1-alpha~150
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a179ff75159476ef475a28bae2615cd7e2e4df7;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.7'
---

9a179ff75159476ef475a28bae2615cd7e2e4df7