From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 6 May 2014 17:54:37 +0000 (-0400)
Subject: Merge remote-tracking branch 'karsten/bug11742'
X-Git-Tag: tor-0.2.5.5-alpha~98
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c7549cb4cde5f157c8df4c60c29b29281600b61d;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'karsten/bug11742'
---

c7549cb4cde5f157c8df4c60c29b29281600b61d