From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 19 Feb 2010 21:58:24 +0000 (-0500)
Subject: Merge remote branch 'sebastian/bug1143'
X-Git-Tag: tor-0.2.2.9-alpha~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=391f75d7927959bb2d77c5adb184c53e17b72cac;p=thirdparty%2Ftor.git

Merge remote branch 'sebastian/bug1143'
---

391f75d7927959bb2d77c5adb184c53e17b72cac