From: Roger Dingledine <arma@torproject.org>
Date: Tue, 16 Nov 2010 04:29:09 +0000 (-0500)
Subject: Merge commit 'nickm/1776_redux_v1' into maint-0.2.2
X-Git-Tag: tor-0.2.2.18-alpha~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a641646a980dcf861f3b438821dfc74e1b98fe40;p=thirdparty%2Ftor.git

Merge commit 'nickm/1776_redux_v1' into maint-0.2.2
---

a641646a980dcf861f3b438821dfc74e1b98fe40