From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 15 Nov 2011 16:59:37 +0000 (-0500)
Subject: Merge remote-tracking branch 'sebastian/bug4469'
X-Git-Tag: tor-0.2.3.8-alpha~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26fcb4bb8c9d3f994a678b641db7b1c91fad8346;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'sebastian/bug4469'
---

26fcb4bb8c9d3f994a678b641db7b1c91fad8346