From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 22 Sep 2014 18:45:38 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug12693_025'
X-Git-Tag: tor-0.2.6.1-alpha~95
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e6150c7fc079d7841bedd0df838b29aef0f497d7;p=thirdparty%2Ftor.git

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

e6150c7fc079d7841bedd0df838b29aef0f497d7