summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-06-03 10:47:35 -0400
committerNick Mathewson <nickm@torproject.org>2011-06-03 10:47:35 -0400
commit13ec1bf5c2d5195789eaa0a002d021c9693a3b71 (patch)
tree93361a0599f43002230ad21974af256b1dc0d4f5 /changes
parent587cc311407e10c04962a9dd69513cc5a71aedd5 (diff)
parentb79d50dfcc77013329b2fbfd4a84af29a5965b27 (diff)
downloadtor-13ec1bf5c2d5195789eaa0a002d021c9693a3b71.tar.gz
tor-13ec1bf5c2d5195789eaa0a002d021c9693a3b71.zip
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug23558
1 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug2355 b/changes/bug2355
new file mode 100644
index 0000000000..ee0ae4b96a
--- /dev/null
+++ b/changes/bug2355
@@ -0,0 +1,8 @@
+ o Major features:
+ - If "UseBridges 1" is set and no bridges are configured, Tor will
+ now refuse to build any circuits until some bridges are set.
+ If "UseBridges auto" is set, Tor will use bridges if they are
+ configured and we are not running as a server, but otherwise
+ will make circuits as usual. The new default is "auto". Patch
+ by anonym.
+