From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 1 Jun 2010 14:36:50 +0000 (-0400)
Subject: Merge commit 'sebastian/bug1381'
X-Git-Tag: tor-0.2.2.14-alpha~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4fa302646d78b58b1a6086e3f221d237a336c7b;p=thirdparty%2Ftor.git

Merge commit 'sebastian/bug1381'
---

d4fa302646d78b58b1a6086e3f221d237a336c7b