diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-20 10:14:43 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-20 10:14:43 -0500 |
| commit | f92b5337573bcc5bf94cd034c033c11db4eca811 (patch) | |
| tree | 60ccf21f54e4fb22c779f6f3ab572658b4a68c93 /scripts | |
| parent | 83ced3e7fe6c7573e17b61ecb1be873fa972b635 (diff) | |
| parent | 1a29ad611cccef7f33ae992b87f4b07242b05a82 (diff) | |
| download | tor-f92b5337573bcc5bf94cd034c033c11db4eca811.tar.gz tor-f92b5337573bcc5bf94cd034c033c11db4eca811.zip | |
Merge remote-tracking branch 'teor/ticket24682'
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/maint/updateFallbackDirs.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 82a60420b4..4d00c0facf 100755 --- 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, |