tor

The Tor anonymity network
git clone https://git.dasho.dev/tor.git
Log | Files | Refs | README | LICENSE
commit 8e5450b7524798467479ebe2aef0f7081a74ea48
parent f92b5337573bcc5bf94cd034c033c11db4eca811
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 20 Dec 2017 10:15:00 -0500

Remove merge-conflict detritus

Diffstat:

Mscripts/maint/updateFallbackDirs.py | 1-


1 file changed, 0 insertions(+), 1 deletion(-)

diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py
@@ -1,7 +1,6 @@
 #!/usr/bin/python
 
 # Usage:
-<<<<<<< Updated upstream
 #
 # Regenerate the list:
 # scripts/maint/updateFallbackDirs.py > src/or/fallback_dirs.inc 2> fallback_dirs.log