From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 7 May 2014 00:40:40 +0000 (-0400)
Subject: Merge branch 'bug11743_option_b'
X-Git-Tag: tor-0.2.5.5-alpha~96
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5cea500ce75116abe4deb46d759f5ac1048dd4cc;p=thirdparty%2Ftor.git

Merge branch 'bug11743_option_b'
---

5cea500ce75116abe4deb46d759f5ac1048dd4cc