summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-11-18 11:02:08 -0500
committerNick Mathewson <nickm@torproject.org>2017-11-18 11:02:08 -0500
commit2d849716df357b570eaf4557638f63a9b2d8a6c1 (patch)
tree0eb4e91ab45377d0097efef1097fbc50f272071a /changes
parent50fbede4597d143411b3739e88d2c3d8ef457fbd (diff)
parent53c3174ee43c3f54f8180be8256180f6f0d24c0d (diff)
downloadtor-2d849716df357b570eaf4557638f63a9b2d8a6c1.tar.gz
tor-2d849716df357b570eaf4557638f63a9b2d8a6c1.zip
Merge branch 'maint-0.2.9' into maint-0.3.0
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.
+