aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-15 11:23:02 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-15 11:23:02 -0400
commit2fd9cfdc234f5ec0d6799511be9ad7a57c52b45e (patch)
tree5b19618c696f6ad992f1ffc436e3dc1e8b14b5e9 /changes
parent7236bb77e24545f3042d263a012e738d5cf325e4 (diff)
parent228b77f64e3d545e9d4dac2adc845ecd929c4ac5 (diff)
downloadtor-2fd9cfdc234f5ec0d6799511be9ad7a57c52b45e.tar.gz
tor-2fd9cfdc234f5ec0d6799511be9ad7a57c52b45e.zip
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts: src/or/routerlist.c
Diffstat (limited to 'changes')
-rw-r--r--changes/bug2732-simple7
1 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug2732-simple b/changes/bug2732-simple
new file mode 100644
index 0000000000..367836152d
--- /dev/null
+++ b/changes/bug2732-simple
@@ -0,0 +1,7 @@
+ o Minor bugfixes
+ - Do not reject hidden service descriptors simply because we don't
+ think we have not been assigned the HSDir flag. Clients and
+ hidden services can have a more up-to-date view of the network
+ consensus, and if they think that the directory authorities
+ list us a HSDir, we might actually be one. Related to bug 2732;
+ bugfix on 0.2.0.10-alpha.