[tor-commits] [arm/master] Dropping CIRC event listener

[atagar at torproject.org]

commit 07e533df751eba58258392805a0d0f6ffe5d6e60
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Jun 1 19:09:35 2013 -0700

    Dropping CIRC event listener
    
    The CIRC event listener is no longer used so dropping it.
---
 src/util/torTools.py |    7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/util/torTools.py b/src/util/torTools.py
index 2d3979e..0cb3a22 100644
--- a/src/util/torTools.py
+++ b/src/util/torTools.py
@@ -109,7 +109,6 @@ class Controller:
       self.controller.add_event_listener(self.ns_event, stem.control.EventType.NS)
       self.controller.add_event_listener(self.new_consensus_event, stem.control.EventType.NEWCONSENSUS)
       self.controller.add_event_listener(self.new_desc_event, stem.control.EventType.NEWDESC)
-      self.controller.add_event_listener(self.circ_status_event, stem.control.EventType.CIRC)
       
       # reset caches for ip -> fingerprint lookups
       self._fingerprintMappings = None
@@ -1149,12 +1148,6 @@ class Controller:
     
     self.connLock.release()
   
-  def circ_status_event(self, event):
-    # CIRC events aren't required, but if one's received then flush this cache
-    # since it uses circuit-status results.
-    self.connLock.acquire()
-    self.connLock.release()
-  
   def _getFingerprintMappings(self, descriptors = None):
     """
     Provides IP address to (port, fingerprint) tuple mappings for all of the