From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 28 Feb 2014 13:32:13 +0000 (-0500)
Subject: Merge remote-tracking branch 'karsten/task-5824'
X-Git-Tag: tor-0.2.5.3-alpha~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=043329eeb653b2f9e795cf8b7cfd8fb0b756dca5;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'karsten/task-5824'
---

043329eeb653b2f9e795cf8b7cfd8fb0b756dca5