From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 27 Jul 2015 13:15:52 +0000 (-0400)
Subject: Merge remote-tracking branch 'yawning/bug16674'
X-Git-Tag: tor-0.2.7.2-alpha~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58758e713f69a6ce2c66367d8524df578520a036;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'yawning/bug16674'
---

58758e713f69a6ce2c66367d8524df578520a036