From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 11 Jul 2011 21:04:21 +0000 (-0400)
Subject: Merge branch 'bug2798'
X-Git-Tag: tor-0.2.3.2-alpha~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=597da4989e6f6a9c1a12ad3197dd6532b1a80035;p=thirdparty%2Ftor.git

Merge branch 'bug2798'
---

597da4989e6f6a9c1a12ad3197dd6532b1a80035