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.
This commit is contained in:
Nick Mathewson
2018-01-08 11:10:53 -05:00
2 changed files with 337 additions and 333 deletions
+5
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.
+332 -333
View File
File diff suppressed because it is too large Load Diff