From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 1 Dec 2016 18:36:06 +0000 (-0500)
Subject: Merge branch 'maint-0.2.9'
X-Git-Tag: tor-0.3.0.1-alpha~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb0d668677e5cb04f6e7b079e4f846d9a34505e4;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.9'
---

bb0d668677e5cb04f6e7b079e4f846d9a34505e4