From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 29 Dec 2014 13:39:13 +0000 (-0500)
Subject: Merge remote-tracking branch 'rl1987/ticket13913'
X-Git-Tag: tor-0.2.6.2-alpha~19
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=fd5d9d04b380b6dfee099273d729e2b7299198af;p=thirdparty%2Ftor.git

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

fd5d9d04b380b6dfee099273d729e2b7299198af