commit f92b5337573bcc5bf94cd034c033c11db4eca811 parent 83ced3e7fe6c7573e17b61ecb1be873fa972b635 Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 20 Dec 2017 10:14:43 -0500 Merge remote-tracking branch 'teor/ticket24682' Diffstat:
| M | scripts/maint/updateFallbackDirs.py | | | 5 | +++-- |
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py @@ -1,12 +1,13 @@ #!/usr/bin/python # Usage: +<<<<<<< Updated upstream # # Regenerate the list: -# scripts/maint/updateFallbackDirs.py > src/or/fallback_dirs.inc +# scripts/maint/updateFallbackDirs.py > src/or/fallback_dirs.inc 2> fallback_dirs.log # # Check the existing list: -# scripts/maint/updateFallbackDirs.py check_existing > fallback_dirs.inc.ok +# scripts/maint/updateFallbackDirs.py check_existing > fallback_dirs.inc.ok 2> fallback_dirs.log # mv fallback_dirs.inc.ok src/or/fallback_dirs.inc # # This script should be run from a stable, reliable network connection,