From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 16 Feb 2014 17:13:12 +0000 (-0500)
Subject: Merge remote-tracking branch 'public/bug10722'
X-Git-Tag: tor-0.2.5.3-alpha~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dfed0806c833e7bc34796a412925c502474bebf;p=thirdparty%2Ftor.git

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

3dfed0806c833e7bc34796a412925c502474bebf