From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 16 Aug 2010 01:27:32 +0000 (-0400)
Subject: Merge commit 'sebastian/misc-reason'
X-Git-Tag: tor-0.2.2.15-alpha~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9bcea4a8ef33bc3f1b66682a0eea463b891cd7ba;p=thirdparty%2Ftor.git

Merge commit 'sebastian/misc-reason'
---

9bcea4a8ef33bc3f1b66682a0eea463b891cd7ba