Merge branch 'bug21074_029'

[tor/appveyor.git] / changes / ticket22321

  o Minor features (fallbacks):
    - Update the fallback whitelist and blacklist based on opt-ins and relay
      changes. Closes tickets 22321, 24678, 22527, 24135, and 24695.