From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 21 May 2015 17:20:24 +0000 (-0400)
Subject: Merge remote-tracking branch 'yawning/ticket16140'
X-Git-Tag: tor-0.2.7.2-alpha~141
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45a90573e69d12dc6fece4c6bab15a1268e90778;p=thirdparty%2Ftor.git

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

45a90573e69d12dc6fece4c6bab15a1268e90778