summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-11-18 11:00:45 -0500
committerNick Mathewson <nickm@torproject.org>2017-11-18 11:00:45 -0500
commit831d3b794da65b03be7e4fd107ba209d7211de76 (patch)
tree8cfff25841446c5ed6129f1f18e5b14abc1802ed /changes
parent6f8c32b7deb9f0cec6d1553aba71969c9fb6064f (diff)
parent9f2efd02a1281998d11049162c11af6bfc5851c0 (diff)
downloadtor-831d3b794da65b03be7e4fd107ba209d7211de76.tar.gz
tor-831d3b794da65b03be7e4fd107ba209d7211de76.zip
Merge branch 'ticket18329_minimal_025' into maint-0.2.5
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.
+