From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 20 Aug 2014 16:44:15 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug12728_024'
X-Git-Tag: tor-0.2.6.1-alpha~196
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0009cb8e8bd2a6f1c84f9f117a71f84045fdfce;p=thirdparty%2Ftor.git

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

d0009cb8e8bd2a6f1c84f9f117a71f84045fdfce