From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 19 Jun 2014 14:42:19 +0000 (-0400)
Subject: Merge remote-tracking branch 'karsten/bug11683'
X-Git-Tag: tor-0.2.6.1-alpha~252
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=922be84ca3eedddfcfd358a4728b7eb0405eb27b;p=thirdparty%2Ftor.git

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

922be84ca3eedddfcfd358a4728b7eb0405eb27b