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

Merge branch 'maint-0.2.9'
---

fc47cc3ed97b328b8ec341320471cff3f538960d