From: Roger Dingledine <arma@torproject.org>
Date: Mon, 2 Jun 2014 06:32:59 +0000 (-0400)
Subject: fix #10405's changes file
X-Git-Tag: tor-0.2.5.5-alpha~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea44287657aeedc9d395b6978b8d7ce6a93e12af;p=thirdparty%2Ftor.git

fix #10405's changes file
---

diff --git a/changes/bug10405 b/changes/bug10405
index 46a0746fd3..d1110e44eb 100644
--- a/changes/bug10405
+++ b/changes/bug10405
@@ -1,4 +1,5 @@
   o Minor bugfixes:
     - Avoid "Tried to open a socket with DisableNetwork set" warnings
-      when starting a bridge client without bridge descriptors. Fixes
-      bug 10405; bugfix on 0.2.3.9-alpha.
+      when starting a client with bridges configured and DisableNetwork
+      set. (Tor launcher starts Tor with DisableNetwork set the first
+      time.) Fixes bug 10405; bugfix on 0.2.3.9-alpha.