[tor-commits] [stem/master] Reverting change to recognize 127.0.0.1 as bridges

[atagar at torproject.org]

commit 9042c172f8544912888d174ab18b4a19882db7e3
Author: Damian Johnson <atagar at torproject.org>
Date:   Mon May 7 09:27:06 2012 -0700

    Reverting change to recognize 127.0.0.1 as bridges
    
    Reverting change 477d448 since Karsten reports that bridges with that scrubbing
    scheme should no longer exist.
---
 stem/descriptor/server_descriptor.py |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py
index 12b0728..8513b86 100644
--- a/stem/descriptor/server_descriptor.py
+++ b/stem/descriptor/server_descriptor.py
@@ -82,15 +82,14 @@ def parse_file(descriptor_file, validate = True):
   # Handler for bridge descriptors
   #
   # Bridge descriptors are scrubbed so their nickname is 'Unnamed' and their
-  # ip address is in the 10.x.x.x space (priorly '127.0.0.1'), which is
-  # normally reserved for private networks. Bridge descriptors only come from
-  # metrics so a file only contains a single descriptor.
+  # ip address is in the 10.x.x.x space, which is normally reserved for private
+  # networks. Bridge descriptors only come from metrics so a file only contains
+  # a single descriptor.
   
   first_line = descriptor_file.readline()
   descriptor_file.seek(0)
   
-  if first_line.startswith("router Unnamed 10.") or \
-    first_line.startswith("router Unnamed 127.0.0.1"):
+  if first_line.startswith("router Unnamed 10."):
     yield BridgeDescriptor(descriptor_file.read())
     return