From: Roger Dingledine <arma@torproject.org>
Date: Mon, 14 Mar 2011 19:52:53 +0000 (-0400)
Subject: Merge branch 'bug2511' into bug2510
X-Git-Tag: tor-0.2.2.24-alpha~6^2~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb101c48155729fa05cef2f255d1de0ad40d6b72;p=thirdparty%2Ftor.git

Merge branch 'bug2511' into bug2510
---

cb101c48155729fa05cef2f255d1de0ad40d6b72