From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 11 Jan 2015 16:10:23 +0000 (-0500)
Subject: Merge remote-tracking branch 'teor/nickm-bug13401'
X-Git-Tag: tor-0.2.6.3-alpha~181
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=180ecd6a2b3ee9fe10fed760d30ac9fb72b03346;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'teor/nickm-bug13401'
---

180ecd6a2b3ee9fe10fed760d30ac9fb72b03346