From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 23 May 2014 15:23:00 +0000 (-0400)
Subject: Merge branch 'bug11965_v2'
X-Git-Tag: tor-0.2.5.5-alpha~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5de91d118ddc3b33bdbed33dbe7fee93f8790c46;p=thirdparty%2Ftor.git

Merge branch 'bug11965_v2'
---

5de91d118ddc3b33bdbed33dbe7fee93f8790c46