From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 6 Feb 2015 20:42:53 +0000 (-0500)
Subject: Merge remote-tracking branch 'sebastian/bug13993'
X-Git-Tag: tor-0.2.6.3-alpha~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e36faeec1d40e1f4f7ae54c798ad4492f86f594c;p=thirdparty%2Ftor.git

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

e36faeec1d40e1f4f7ae54c798ad4492f86f594c