diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-08 11:10:53 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-08 11:10:53 -0500 |
| commit | 9ba69be96c102ff47c79f8e332127599d8ebe18e (patch) | |
| tree | 387eadb35c132ead0c9031881b9fe33750be81cd /changes | |
| parent | d6374681281c64156bf282bdb65ddd9ac7c881e7 (diff) | |
| parent | 1c5c5f0e50084c7a36991212ddf21295306da17f (diff) | |
| download | tor-9ba69be96c102ff47c79f8e332127599d8ebe18e.tar.gz tor-9ba69be96c102ff47c79f8e332127599d8ebe18e.zip | |
Merge branch 'maint-0.3.2'
There was a merge conflict on fallback_dirs.inc, which we resolve in
favor of the newly generated version for #24801.
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/ticket_24801 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/ticket_24801 b/changes/ticket_24801 new file mode 100644 index 0000000000..f5f6c831af --- /dev/null +++ b/changes/ticket_24801 @@ -0,0 +1,5 @@ + o Minor features (new fallback directories): + - The fallback directory list has been re-generated based on the + current status of the network. Tor uses fallback directories to + bootstrap it doesn't yet have up-to-date directory + information. Closes ticket 24801. |