diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:43:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:43:06 -0400 |
| commit | dfa6cde4d4de57476ea8381199dfbac1afc245d5 (patch) | |
| tree | 73b8f1ecac21bfad33f43c7759e5dfecf43361bc /changes | |
| parent | 5f9cdee8afd3fb0db835c19993fae476e0f00033 (diff) | |
| parent | f45261cb29504bfe39ddb96d8e7f38bb32dd37a5 (diff) | |
| download | tor-dfa6cde4d4de57476ea8381199dfbac1afc245d5.tar.gz tor-dfa6cde4d4de57476ea8381199dfbac1afc245d5.zip | |
Merge remote-tracking branch 'public/bug2649_squashed' into maint-0.2.2
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug2649a | 5 | ||||
| -rw-r--r-- | changes/bug2649b | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changes/bug2649a b/changes/bug2649a new file mode 100644 index 0000000000..4ee31ebdb6 --- /dev/null +++ b/changes/bug2649a @@ -0,0 +1,5 @@ + o Minor features: + - Add a VoteOnHidServDirectoriesV2 configuration option to allow + directory authorities to abstain from voting on assignment of + the HSDir consensus flag. Related to bug 2649. + diff --git a/changes/bug2649b b/changes/bug2649b new file mode 100644 index 0000000000..1ff14e5569 --- /dev/null +++ b/changes/bug2649b @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Change the default required uptime for a relay to be accepted as + a HSDir from 24 hours to 25 hours. Bugfix on 0.2.0.10-alpha; + fixes bug 2649. + |