aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-10-09 10:55:09 -0400
committerNick Mathewson <nickm@torproject.org>2014-10-09 10:55:09 -0400
commite5f9f287ced36e18241e250d4b63603b9c4f006f (patch)
tree6577917d3432883bf7c43bb6a2e615a006fbce8c /changes
parentcc5571e1f1e4d61d584fe20959b686d798bb7691 (diff)
parent31bf8f26907945b8f26a7543e42ce0e92dd4918f (diff)
downloadtor-e5f9f287ced36e18241e250d4b63603b9c4f006f.tar.gz
tor-e5f9f287ced36e18241e250d4b63603b9c4f006f.zip
Merge remote-tracking branch 'teor/bug-13163-AlternateAuthorities-type-handling-fixed'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug13163-bitwise-check-BRIDGE-DIRINFO5
-rw-r--r--changes/bug13163-stop-AlternateAuthorities-always-using-default-authorities4
-rw-r--r--changes/issue13163-improve-DIRINFO-flags-comments5
3 files changed, 14 insertions, 0 deletions
diff --git a/changes/bug13163-bitwise-check-BRIDGE-DIRINFO b/changes/bug13163-bitwise-check-BRIDGE-DIRINFO
new file mode 100644
index 0000000000..7f5ec05037
--- /dev/null
+++ b/changes/bug13163-bitwise-check-BRIDGE-DIRINFO
@@ -0,0 +1,5 @@
+ o Minor bugfixes:
+ - Bitwise check the BRIDGE_DIRINFO flag rather than using equality.
+ Fixes a (potential) bug where directories offering BRIDGE_DIRINFO and
+ some other flag (i.e. microdescriptors or extrainfo) would be ignored
+ when looking for bridge directories. Partially fixes bug 13163.
diff --git a/changes/bug13163-stop-AlternateAuthorities-always-using-default-authorities b/changes/bug13163-stop-AlternateAuthorities-always-using-default-authorities
new file mode 100644
index 0000000000..eeaca926a2
--- /dev/null
+++ b/changes/bug13163-stop-AlternateAuthorities-always-using-default-authorities
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - Stop using the default authorities in networks which provide both
+ AlternateDirAuthority and AlternateBridgeAuthority.
+ Partially fixes bug 13163.
diff --git a/changes/issue13163-improve-DIRINFO-flags-comments b/changes/issue13163-improve-DIRINFO-flags-comments
new file mode 100644
index 0000000000..3acb1f3caf
--- /dev/null
+++ b/changes/issue13163-improve-DIRINFO-flags-comments
@@ -0,0 +1,5 @@
+ o Minor refactoring:
+ - Document usage of the NO_DIRINFO and ALL_DIRINFO flags clearly in
+ functions which take them as arguments. Replace 0 with NO_DIRINFO
+ in a function call for clarity.
+ Seeks to prevent future issues like 13163.