From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 7 Jan 2015 16:45:24 +0000 (-0500)
Subject: Merge remote-tracking branch 'public/bug13988_025'
X-Git-Tag: tor-0.2.6.3-alpha~192
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7dd852835c24a2db1cc4751f3b9235a8c78bf775;p=thirdparty%2Ftor.git

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

7dd852835c24a2db1cc4751f3b9235a8c78bf775