From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 18 Jun 2012 16:07:39 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug3311'
X-Git-Tag: tor-0.2.3.18-rc~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6782b355ae77455aaff3af9fe3831c07312a5c8;p=thirdparty%2Ftor.git

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

e6782b355ae77455aaff3af9fe3831c07312a5c8