From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 18 Nov 2016 01:08:15 +0000 (-0500)
Subject: Merge branch 'maint-0.2.9'
X-Git-Tag: tor-0.3.0.1-alpha~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=427dcb29b573d839551e8e3982af6e40d7d42609;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.9'
---

427dcb29b573d839551e8e3982af6e40d7d42609