From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 12 Feb 2015 19:50:13 +0000 (-0500)
Subject: Merge remote-tracking branch 'sebastian/bug14875'
X-Git-Tag: tor-0.2.6.3-alpha~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5644d92dd7081e4a18d7385e68cee907ba67c451;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'sebastian/bug14875'
---

5644d92dd7081e4a18d7385e68cee907ba67c451