From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 12 Nov 2014 18:12:14 +0000 (-0500)
Subject: Merge remote-tracking branch 'rl1987/bug13644'
X-Git-Tag: tor-0.2.6.2-alpha~94
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81433e74322bb6cab67458ff7ba524ee86ad7e1c;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'rl1987/bug13644'
---

81433e74322bb6cab67458ff7ba524ee86ad7e1c