From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 7 Nov 2016 16:02:15 +0000 (-0500)
Subject: Merge branch 'maint-0.2.9'
X-Git-Tag: tor-0.3.0.1-alpha~145
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1934bf75ef753e437aa60fe466312017840dd737;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.9'
---

1934bf75ef753e437aa60fe466312017840dd737