[tor-commits] [tor/master] Make fallback script usage instructions create a log file

[nickm at torproject.org]

commit 1a29ad611cccef7f33ae992b87f4b07242b05a82
Author: teor <teor2345 at gmail.com>
Date:   Wed Dec 20 12:36:31 2017 +1100

    Make fallback script usage instructions create a log file
    
    Comment-only change.
    
    Closes 24682.
---
 scripts/maint/updateFallbackDirs.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py
index 82a60420b..4d00c0fac 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,