From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 15 Nov 2010 20:31:40 +0000 (-0500)
Subject: Merge branch 'bug2000_nm_022' into maint-0.2.2
X-Git-Tag: tor-0.2.2.18-alpha~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=522c204ac987acd2abc61d81f9535fe929e860e6;p=thirdparty%2Ftor.git

Merge branch 'bug2000_nm_022' into maint-0.2.2
---

522c204ac987acd2abc61d81f9535fe929e860e6