From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 12 Dec 2009 07:10:57 +0000 (-0500)
Subject: Merge commit 'sebastian/fixes'
X-Git-Tag: tor-0.2.2.7-alpha~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d086c9a7f73ce5b9b7cf4add07fa7d071b829081;p=thirdparty%2Ftor.git

Merge commit 'sebastian/fixes'
---

d086c9a7f73ce5b9b7cf4add07fa7d071b829081