From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 9 Oct 2013 16:36:24 +0000 (-0400)
Subject: Merge remote-tracking branch 'karsten/task-9854-2'
X-Git-Tag: tor-0.2.5.2-alpha~140
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bcde4cc4cf521c8e125e95cdd793aa499d1a36c7;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'karsten/task-9854-2'
---

bcde4cc4cf521c8e125e95cdd793aa499d1a36c7