Commit 9ba69be9 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

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.
parents d6374681 1c5c5f0e

changes/ticket_24801

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  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.

src/or/fallback_dirs.inc

+317 −318

File changed.

Preview size limit exceeded, changes collapsed.