aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-11-18 11:01:33 -0500
committerNick Mathewson <nickm@torproject.org>2017-11-18 11:01:33 -0500
commitd388f9d879ebedf05c7f399f8b8eb3df9c43d3af (patch)
tree8e246f14507317f55e7447dc1d1688d953ab6dc0 /changes
parent800797e7f3c6cfacbf9655ef7d57ba96028a5c06 (diff)
parent831d3b794da65b03be7e4fd107ba209d7211de76 (diff)
downloadtor-d388f9d879ebedf05c7f399f8b8eb3df9c43d3af.tar.gz
tor-d388f9d879ebedf05c7f399f8b8eb3df9c43d3af.zip
Merge branch 'maint-0.2.5' into maint-0.2.8
Diffstat (limited to 'changes')
-rw-r--r--changes/bug18329-minimal6
1 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug18329-minimal b/changes/bug18329-minimal
new file mode 100644
index 0000000000..804c4e8dd1
--- /dev/null
+++ b/changes/bug18329-minimal
@@ -0,0 +1,6 @@
+ o Minor features (bridge):
+ - Bridges now include notice in their descriptors that they are bridges,
+ and notice of their distribution status, based on their publication
+ settings. Implements ticket 18329. For more fine-grained control of
+ how a bridge is distributed, upgrade to 0.3.2.x or later.
+