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

Merge branch 'maint-0.2.9'
---

fd51d06b9053891d349ae83b678588ccb33cd0ad