From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 27 Oct 2014 16:12:16 +0000 (-0400)
Subject: Merge remote-tracking branch 'sebastian/bug13286'
X-Git-Tag: tor-0.2.6.1-alpha~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0793ef862b4991281bcb9155f0d15a3930889bea;p=thirdparty%2Ftor.git

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

0793ef862b4991281bcb9155f0d15a3930889bea