[tor-commits] [torflow/master] Disable microdescriptors

[mikeperry at torproject.org]

commit e0ac2612ca190172e5d6b063f6e308612653e29f
Author: aagbsn <aagbsn at extc.org>
Date:   Wed Aug 24 16:45:50 2011 -0700

    Disable microdescriptors
    
    microdescriptors are enabled by default since v0.2.3.2-alpha-dev
    TorCtl does not support microdescriptors
---
 NetworkScanners/BwAuthority/bwauthority_child.py |    2 +-
 NetworkScanners/BwAuthority/data/tor/torrc       |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/NetworkScanners/BwAuthority/bwauthority_child.py b/NetworkScanners/BwAuthority/bwauthority_child.py
index 74ec257..4aa7607 100755
--- a/NetworkScanners/BwAuthority/bwauthority_child.py
+++ b/NetworkScanners/BwAuthority/bwauthority_child.py
@@ -339,7 +339,7 @@ def ignore_streams(c,hdlr):
     hdlr.streams[s.strm_id] = s
 
 def cleanup(c):
-  c.close()
+  if c: c.close()
   plog("DEBUG", "Child Process Exiting...")
 
 def setup_handler(out_dir, cookie_file):
diff --git a/NetworkScanners/BwAuthority/data/tor/torrc b/NetworkScanners/BwAuthority/data/tor/torrc
index ee677ff..11b8368 100644
--- a/NetworkScanners/BwAuthority/data/tor/torrc
+++ b/NetworkScanners/BwAuthority/data/tor/torrc
@@ -8,3 +8,4 @@ PidFile ./data/tor/tor.pid
 CookieAuthentication 1
 FetchUselessDescriptors 1
 __LeaveStreamsUnattached 1
+UseMicrodescriptors 0