From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 6 Jan 2015 19:28:02 +0000 (-0500)
Subject: Merge remote-tracking branch 'public/bug14116_025'
X-Git-Tag: tor-0.2.6.3-alpha~200
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3401c34151a29fe962944ce3ea77f14056c87efa;p=thirdparty%2Ftor.git

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

3401c34151a29fe962944ce3ea77f14056c87efa