From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 16 Sep 2015 12:20:15 +0000 (-0400)
Subject: Merge remote-tracking branch 'teor/bug16069-bug17027'
X-Git-Tag: tor-0.2.7.3-rc~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b257e34583d428dc0f9b6f06ca3f470e794ab513;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'teor/bug16069-bug17027'
---

b257e34583d428dc0f9b6f06ca3f470e794ab513