From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 3 Nov 2016 19:41:18 +0000 (-0400)
Subject: Merge branch 'maint-0.2.9'
X-Git-Tag: tor-0.3.0.1-alpha~182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0abaedbf3469dfca8833867feef789c6d4e59225;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.9'
---

0abaedbf3469dfca8833867feef789c6d4e59225