From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 10 Sep 2012 14:04:30 +0000 (-0400)
Subject: bug3155 changes file
X-Git-Tag: tor-0.2.4.2-alpha~11^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38f3f3baf9e2e2e76b804afa635f94fb466babc8;p=thirdparty%2Ftor.git

bug3155 changes file
---

diff --git a/changes/bug3155 b/changes/bug3155
new file mode 100644
index 0000000000..a0ebd530cb
--- /dev/null
+++ b/changes/bug3155
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Rename the (internal-use-only) UsingTestingNetworkDefaults option
+      to start with a triple-underscore so the controller won't touch it.
+      Patch by Meejah. Fixes bug 3155. Bugfix on 0.2.2.23-alpha.