From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 25 Oct 2013 16:15:31 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug9934_nm'
X-Git-Tag: tor-0.2.5.2-alpha~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7578606a2265466bc4546f0d08b9dbdf427e7c1c;p=thirdparty%2Ftor.git

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

7578606a2265466bc4546f0d08b9dbdf427e7c1c