From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 16 Aug 2010 03:43:36 +0000 (-0400)
Subject: Merge commit 'sebastian/bug1831'
X-Git-Tag: tor-0.2.2.15-alpha~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a856f446c7c95b338157511a55760575751544bc;p=thirdparty%2Ftor.git

Merge commit 'sebastian/bug1831'
---

a856f446c7c95b338157511a55760575751544bc