From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 21 Jan 2015 18:00:26 +0000 (-0500)
Subject: Merge branch 'bug9819'
X-Git-Tag: tor-0.2.6.3-alpha~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0415c16001ebfd06aec7a16bdf8677c7a931b65;p=thirdparty%2Ftor.git

Merge branch 'bug9819'
---

f0415c16001ebfd06aec7a16bdf8677c7a931b65