From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 5 May 2015 19:06:57 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug15821_025'
X-Git-Tag: tor-0.2.7.1-alpha~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0ea36d779a0d9e5d94bdb056fb20b93240e404c;p=thirdparty%2Ftor.git

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

b0ea36d779a0d9e5d94bdb056fb20b93240e404c