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

Merge commit 'sebastian/bug1776_v2'
---

fbfaa7bbc417d7adc19dc55154a8648fe6412ec6