mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.3.2'

Browse source 
There was a merge conflict on fallback_dirs.inc, which we resolve in
favor of the newly generated version for #24801.
This commit is contained in:
Nick Mathewson 2018-01-08 11:10:53 -05:00
commit 9ba69be96c
2 changed files with 337 additions and 333 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changes/ticket_24801 Normal file
View file

@ -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.

665
src/or/fallback_dirs.inc
View file

File diff suppressed because it is too large Load diff