From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 31 May 2012 16:22:02 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug2954_more'
X-Git-Tag: tor-0.2.3.16-alpha~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11bf5585aafa4ea590b4f4b62a75323fb5907d95;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug2954_more'
---

11bf5585aafa4ea590b4f4b62a75323fb5907d95