- tor-commits - lists.torproject.org

r24539: {arm} Correcting a horrible caching error causing most GETINFO que (arm/trunk/src/util)
by Damian Johnson 02 Apr '11

02 Apr '11

Author: atagar Date: 2011-04-02 23:51:15 +0000 (Sat, 02 Apr 2011) New Revision: 24539 Modified: arm/trunk/src/util/torTools.py Log: Correcting a horrible caching error causing most GETINFO queries to be inadvertantly persisted. Modified: arm/trunk/src/util/torTools.py =================================================================== --- arm/trunk/src/util/torTools.py 2011-04-02 23:00:11 UTC (rev 24538) +++ arm/trunk/src/util/torTools.py 2011-04-02 23:51:15 UTC (rev 24539) @@ -56,7 +56,7 @@ "nsEntry", "descEntry", "address", "bwRate", "bwBurst", "bwObserved", "bwMeasured", "flags", "parsedVersion", "pid", "pathPrefix", "startTime", "authorities", "circuits", "hsPorts") -CACHE_GETINFO_PREFIX_ARGS = ("ip-to-country/") +CACHE_GETINFO_PREFIX_ARGS = ("ip-to-country/", ) # Tor has a couple messages (in or/router.c) for when our ip address changes: # "Our IP Address has changed from <previous> to <current>; rebuilding

1 0

r24538: {arm} Freezing connection display when tor stops. (arm/trunk/src/interface/connections)
by Damian Johnson 02 Apr '11

02 Apr '11

Author: atagar Date: 2011-04-02 23:00:11 +0000 (Sat, 02 Apr 2011) New Revision: 24538 Modified: arm/trunk/src/interface/connections/connPanel.py Log: Freezing connection display when tor stops. Modified: arm/trunk/src/interface/connections/connPanel.py =================================================================== --- arm/trunk/src/interface/connections/connPanel.py 2011-04-02 22:42:48 UTC (rev 24537) +++ arm/trunk/src/interface/connections/connPanel.py 2011-04-02 23:00:11 UTC (rev 24538) @@ -54,6 +54,7 @@ self._showDetails = False # presents the details panel if true self._lastUpdate = -1 # time the content was last revised + self._isTorRunning = True # indicates if tor is currently running or not self._isPaused = True # prevents updates if true self._pauseTime = None # time when the panel was paused self._halt = False # terminates thread if true @@ -77,7 +78,27 @@ for entry in self._entries: if isinstance(entry, connEntry.ConnectionEntry): entry.getLines()[0].isInitialConnection = True + + # listens for when tor stops so we know to stop reflecting changes + torTools.getConn().addStatusListener(self.torStateListener) + def torStateListener(self, conn, eventType): + """ + Freezes the connection contents when Tor stops. + + Arguments: + conn - tor controller + eventType - type of event detected + """ + + self._isTorRunning = eventType == torTools.State.INIT + + if self._isPaused or not self._isTorRunning: + if not self._pauseTime: self._pauseTime = time.time() + else: self._pauseTime = None + + self.redraw(True) + def setPaused(self, isPause): """ If true, prevents the panel from updating. @@ -86,7 +107,8 @@ if not self._isPaused == isPause: self._isPaused = isPause - if isPause: self._pauseTime = time.time() + if isPause or not self._isTorRunning: + if not self._pauseTime: self._pauseTime = time.time() else: self._pauseTime = None # redraws so the display reflects any changes between the last update @@ -151,7 +173,7 @@ while not self._halt: currentTime = time.time() - if self._isPaused or currentTime - lastDraw < self._config["features.connection.refreshRate"]: + if self._isPaused or not self._isTorRunning or currentTime - lastDraw < self._config["features.connection.refreshRate"]: self._cond.acquire() if not self._halt: self._cond.wait(0.2) self._cond.release()

1 0

r24537: {arm} Connection reordering, putting them in logical groupings (re (arm/trunk/src/interface/connections)
by Damian Johnson 02 Apr '11

02 Apr '11

Author: atagar Date: 2011-04-02 22:42:48 +0000 (Sat, 02 Apr 2011) New Revision: 24537 Modified: arm/trunk/src/interface/connections/connEntry.py Log: Connection reordering, putting them in logical groupings (relay, client, other) Modified: arm/trunk/src/interface/connections/connEntry.py =================================================================== --- arm/trunk/src/interface/connections/connEntry.py 2011-04-02 22:10:13 UTC (rev 24536) +++ arm/trunk/src/interface/connections/connEntry.py 2011-04-02 22:42:48 UTC (rev 24537) @@ -13,16 +13,17 @@ # Inbound Relay connection, coming to us. # Outbound Relay connection, leaving us. # Exit Outbound relay connection leaving the Tor network. -# Client Circuits for our client traffic. -# Program Socks connections for applications using Tor. +# Hidden Connections to a hidden service we're providing. +# Socks Socks connections for applications using Tor. +# Circuit Circuits our tor client has created. # Directory Fetching tor consensus information. # Control Tor controller (arm, vidalia, etc). -Category = enum.Enum("INBOUND", "OUTBOUND", "EXIT", "CIRCUIT", "DIRECTORY", "SOCKS", "HIDDEN", "CONTROL") +Category = enum.Enum("INBOUND", "OUTBOUND", "EXIT", "HIDDEN", "SOCKS", "CIRCUIT", "DIRECTORY", "CONTROL") CATEGORY_COLOR = {Category.INBOUND: "green", Category.OUTBOUND: "blue", - Category.EXIT: "red", Category.CIRCUIT: "cyan", - Category.DIRECTORY: "magenta", Category.SOCKS: "yellow", - Category.HIDDEN: "magenta", Category.CONTROL: "red"} + Category.EXIT: "red", Category.HIDDEN: "magenta", + Category.SOCKS: "yellow", Category.CIRCUIT: "cyan", + Category.DIRECTORY: "magenta", Category.CONTROL: "red"} # static data for listing format # <src> --> <dst> <etc><padding>

1 0

r24536: {arm} Alignment fixes for the circ entries. (arm/trunk/src/interface/connections)
by Damian Johnson 02 Apr '11

02 Apr '11

Author: atagar Date: 2011-04-02 22:10:13 +0000 (Sat, 02 Apr 2011) New Revision: 24536 Modified: arm/trunk/src/interface/connections/circEntry.py Log: Alignment fixes for the circ entries. Modified: arm/trunk/src/interface/connections/circEntry.py =================================================================== --- arm/trunk/src/interface/connections/circEntry.py 2011-04-02 21:54:34 UTC (rev 24535) +++ arm/trunk/src/interface/connections/circEntry.py 2011-04-02 22:10:13 UTC (rev 24536) @@ -127,7 +127,8 @@ for i in range(len(etcAttr), -1, -1): etcLabel = ", ".join(etcAttr[:i]) - if len(etcLabel) <= width: return etcLabel + if len(etcLabel) <= width: + return ("%%-%is" % width) % etcLabel return "" @@ -202,8 +203,8 @@ dst = "%-55s" % self.foreign.getFingerprint() etc = self.getEtcContent(width - baselineSpace - len(dst), listingType) else: - # min space for the nickname is 50 characters - etc = self.getEtcContent(width - baselineSpace - 50, listingType) + # min space for the nickname is 56 characters + etc = self.getEtcContent(width - baselineSpace - 56, listingType) dstLayout = "%%-%is" % (width - baselineSpace - len(etc)) dst = dstLayout % self.foreign.getNickname()

1 0

r24535: {arm} Dropping the HOSTNAME listing type as an option until that c (arm/trunk/src/interface)
by Damian Johnson 02 Apr '11

02 Apr '11

Author: atagar Date: 2011-04-02 21:54:34 +0000 (Sat, 02 Apr 2011) New Revision: 24535 Modified: arm/trunk/src/interface/controller.py Log: Dropping the HOSTNAME listing type as an option until that content is availble. Modified: arm/trunk/src/interface/controller.py =================================================================== --- arm/trunk/src/interface/controller.py 2011-04-02 21:51:23 UTC (rev 24534) +++ arm/trunk/src/interface/controller.py 2011-04-02 21:54:34 UTC (rev 24535) @@ -1610,6 +1610,10 @@ elif page == 2 and (key == ord('l') or key == ord('L')): # provides a menu to pick the primary information we list connections by options = interface.connections.entries.ListingType.values() + + # dropping the HOSTNAME listing type until we support displaying that content + options.remove(interface.connections.entries.ListingType.HOSTNAME) + initialSelection = options.index(panels["conn2"]._listingType) # hides top label of connection panel and pauses the display

1 0

r24534: {arm} Making the etc content greedy, consuming the full space avai (arm/trunk/src/interface/connections)
by Damian Johnson 02 Apr '11

02 Apr '11

Author: atagar Date: 2011-04-02 21:51:23 +0000 (Sat, 02 Apr 2011) New Revision: 24534 Modified: arm/trunk/src/interface/connections/connEntry.py Log: Making the etc content greedy, consuming the full space available to it to get better column alignment for all listing types. The disadvantage of this is that dynamically sized columns (hostname and nickname) will have less room available to them. Modified: arm/trunk/src/interface/connections/connEntry.py =================================================================== --- arm/trunk/src/interface/connections/connEntry.py 2011-04-02 20:39:38 UTC (rev 24533) +++ arm/trunk/src/interface/connections/connEntry.py 2011-04-02 21:51:23 UTC (rev 24534) @@ -463,7 +463,9 @@ displayLabel = "resolving..." else: displayLabel = "UNKNOWN" - return displayLabel + if len(displayLabel) < width: + return ("%%-%is" % width) % displayLabel + else: return "" # for everything else display connection/consensus information dstAddress = self.getDestinationLabel(26, includeLocale = True) @@ -527,7 +529,7 @@ etc += "%-26s " % dstAddress usedSpace += 28 - return etc + return ("%%-%is" % width) % etc def _getListingContent(self, width, listingType): """ @@ -569,13 +571,13 @@ else: srcAddress = self.local.getIpAddr() + localPort if myType in (Category.SOCKS, Category.CONTROL): - # These categories are reordered later so the it's dst -> src rather - # than src -> dst. They are local connections so the dst lacks locale - # information, so swapping their respective widths to match column - # alignments. + # Like inbound connections these need their source and destination to + # be swapped. However, this only applies when listing by IP or hostname + # (their fingerprint and nickname are both for us). Reversing the + # fields here to keep the same column alignments. - src = "%-26s" % srcAddress - dst = "%-21s" % dstAddress + src = "%-21s" % dstAddress + dst = "%-26s" % srcAddress else: src = "%-21s" % srcAddress # ip:port = max of 21 characters dst = "%-26s" % dstAddress # ip:port (xx) = max of 26 characters @@ -600,6 +602,8 @@ usedSpace += len(etc) elif listingType == entries.ListingType.HOSTNAME: # 15 characters for source, and a min of 40 reserved for the destination + # TODO: when actually functional the src and dst need to be swapped for + # SOCKS and CONTROL connections src = "localhost%-6s" % localPort usedSpace += len(src) minHostnameSpace = 40 @@ -648,7 +652,7 @@ # pads dst entry to its max space dst = ("%%-%is" % (baseSpace - len(src))) % dst - if myType in (Category.INBOUND, Category.SOCKS, Category.CONTROL): src, dst = dst, src + if myType == Category.INBOUND: src, dst = dst, src padding = " " * (width - usedSpace + LABEL_MIN_PADDING) return LABEL_FORMAT % (src, dst, etc, padding)

1 0

r24533: {arm} Overwriting local connections with our fingerprint so they'r (arm/trunk/src/interface/connections)
by Damian Johnson 02 Apr '11

02 Apr '11

Author: atagar Date: 2011-04-02 20:39:38 +0000 (Sat, 02 Apr 2011) New Revision: 24533 Modified: arm/trunk/src/interface/connections/connEntry.py Log: Overwriting local connections with our fingerprint so they're identified as our relay. Modified: arm/trunk/src/interface/connections/connEntry.py =================================================================== --- arm/trunk/src/interface/connections/connEntry.py 2011-04-02 19:57:30 UTC (rev 24532) +++ arm/trunk/src/interface/connections/connEntry.py 2011-04-02 20:39:38 UTC (rev 24533) @@ -129,11 +129,11 @@ determined. """ - conn = torTools.getConn() - orPort = self.port if self.isORPort else None - myFingerprint = conn.getRelayFingerprint(self.ipAddr, orPort) + myFingerprint = self.getFingerprint() - if myFingerprint: return conn.getRelayNickname(myFingerprint) + if myFingerprint != "UNKNOWN": + conn = torTools.getConn() + return conn.getRelayNickname(myFingerprint) else: return "UNKNOWN" class ConnectionEntry(entries.ConnectionPanelEntry): @@ -190,6 +190,10 @@ self.startTime = time.time() self.isInitialConnection = False + # overwrite the local fingerprint with ours + conn = torTools.getConn() + self.local.fingerprintOverwrite = conn.getInfo("fingerprint") + # True if the connection has matched the properties of a client/directory # connection every time we've checked. The criteria we check is... # client - first hop in an established circuit @@ -204,7 +208,6 @@ self.appPid = None self.isAppResolving = False - conn = torTools.getConn() myOrPort = conn.getOption("ORPort") myDirPort = conn.getOption("DirPort") mySocksPort = conn.getOption("SocksPort", "9050")

1 0

r24532: {arm} Notes for the descriptor popup. This is a very rarely used p (in arm/trunk/src/interface: . connections)
by Damian Johnson 02 Apr '11

02 Apr '11

Author: atagar Date: 2011-04-02 19:57:30 +0000 (Sat, 02 Apr 2011) New Revision: 24532 Modified: arm/trunk/src/interface/connections/connEntry.py arm/trunk/src/interface/connections/entries.py arm/trunk/src/interface/controller.py Log: Notes for the descriptor popup. This is a very rarely used part of the interface and won't be implemented until 1.4.3. Modified: arm/trunk/src/interface/connections/connEntry.py =================================================================== --- arm/trunk/src/interface/connections/connEntry.py 2011-04-02 02:26:05 UTC (rev 24531) +++ arm/trunk/src/interface/connections/connEntry.py 2011-04-02 19:57:30 UTC (rev 24532) @@ -325,6 +325,21 @@ detailFormat = curses.A_BOLD | uiTools.getColor(CATEGORY_COLOR[self.getType()]) return [uiTools.DrawEntry(line, detailFormat) for line in self._getDetailContent(width)] + def _getDescriptors(self, width): + """ + Provides raw descriptor information for the relay. + + Arguments: + width - available space to display in + """ + + # TODO: Porting and refactoring the descriptorPopup.py functionality is + # gonna take quite a bit of work. This is a very rarely used feature and + # not worth delaying the 1.4.2 release any further, so this will be a part + # of 1.4.3. + + return [] + def resetDisplay(self): entries.ConnectionPanelLine.resetDisplay(self) self.cachedType = None Modified: arm/trunk/src/interface/connections/entries.py =================================================================== --- arm/trunk/src/interface/connections/entries.py 2011-04-02 02:26:05 UTC (rev 24531) +++ arm/trunk/src/interface/connections/entries.py 2011-04-02 19:57:30 UTC (rev 24532) @@ -102,6 +102,9 @@ self._detailsCache = None self._detailsCacheArgs = None + + self._descriptorCache = None + self._descriptorCacheArgs = None def getListingEntry(self, width, currentTime, listingType): """ @@ -142,9 +145,28 @@ return self._detailsCache def _getDetails(self, width): - # implementation of getListing + # implementation of getDetails return [] + def getDescriptor(self, width): + """ + Provides a list of DrawEntry instances with descriptor informatoin for + this connection. + + Arguments: + width - available space to display in + """ + + if self._descriptorCacheArgs != width: + self._descriptorCache = self._getDescriptor(width) + self._descriptorCacheArgs = width + + return self._descriptorCache + + def _getDescriptor(self, width): + # implementation of getDescriptor + return [] + def resetDisplay(self): """ Flushes cached display results. Modified: arm/trunk/src/interface/controller.py =================================================================== --- arm/trunk/src/interface/controller.py 2011-04-02 02:26:05 UTC (rev 24531) +++ arm/trunk/src/interface/controller.py 2011-04-02 19:57:30 UTC (rev 24532) @@ -1003,7 +1003,7 @@ popup.addfstr(2, 41, "page down: scroll down a page") popup.addfstr(3, 2, "enter: edit configuration option") - popup.addfstr(3, 41, "d: raw consensus descriptor") + #popup.addfstr(3, 41, "d: raw consensus descriptor") listingType = panels["conn2"]._listingType.lower() popup.addfstr(4, 2, "l: listed identity (%s)" % listingType) @@ -1013,6 +1013,8 @@ resolverUtil = connections.getResolver("tor").overwriteResolver if resolverUtil == None: resolverUtil = "auto" popup.addfstr(5, 2, "u: resolving utility (%s)" % resolverUtil) + + pageOverrideKeys = (ord('l'), ord('s'), ord('u')) elif page == 3: popup.addfstr(1, 2, "up arrow: scroll up a line") popup.addfstr(1, 41, "down arrow: scroll down a line")

1 0

r24531: {arm} Corrections and added scope for caching. With this the cpu u (arm/trunk/src/util)
by Damian Johnson 02 Apr '11

02 Apr '11

Author: atagar Date: 2011-04-02 02:26:05 +0000 (Sat, 02 Apr 2011) New Revision: 24531 Modified: arm/trunk/src/util/torTools.py Log: Corrections and added scope for caching. With this the cpu usage of the new connection panel is roughly half of the previous version. :) Modified: arm/trunk/src/util/torTools.py =================================================================== --- arm/trunk/src/util/torTools.py 2011-04-02 01:47:53 UTC (rev 24530) +++ arm/trunk/src/util/torTools.py 2011-04-02 02:26:05 UTC (rev 24531) @@ -56,6 +56,7 @@ "nsEntry", "descEntry", "address", "bwRate", "bwBurst", "bwObserved", "bwMeasured", "flags", "parsedVersion", "pid", "pathPrefix", "startTime", "authorities", "circuits", "hsPorts") +CACHE_GETINFO_PREFIX_ARGS = ("ip-to-country/") # Tor has a couple messages (in or/router.c) for when our ip address changes: # "Our IP Address has changed from <previous> to <current>; rebuilding @@ -298,8 +299,9 @@ # messages. self._pathPrefixLogging = True - # cached GETINFO parameters (None if unset or possibly changed) - self._cachedParam = dict([(arg, None) for arg in CACHE_ARGS]) + # cached parameters for GETINFO and custom getters (None if unset or + # possibly changed) + self._cachedParam = {} # cached GETCONF parameters, entries consisting of: # (option, fetch_type) => value @@ -443,11 +445,22 @@ self.connLock.acquire() + # checks if this is an arg caching covers + isCacheArg = param in CACHE_ARGS + + if not isCacheArg: + for prefix in CACHE_GETINFO_PREFIX_ARGS: + if param.startswith(prefix): + isCacheArg = True + break + startTime = time.time() result, raisedExc, isFromCache = default, None, False if self.isAlive(): - if param in CACHE_ARGS and self._cachedParam[param]: - result = self._cachedParam[param] + cachedValue = self._cachedParam.get(param) + + if isCacheArg and cachedValue: + result = cachedValue isFromCache = True else: try: @@ -457,7 +470,7 @@ if type(exc) == TorCtl.TorCtlClosed: self.close() raisedExc = exc - if not isFromCache and result and param in CACHE_ARGS: + if isCacheArg and result and not isFromCache: self._cachedParam[param] = result if isFromCache: @@ -564,17 +577,17 @@ if type(exc) == TorCtl.TorCtlClosed: self.close() result, raisedExc = default, exc - if not isFromCache and result: + if not isFromCache: cacheValue = result if fetchType == "list": cacheValue = list(result) elif fetchType == "map": cacheValue = dict(result) self._cachedConf[(param.lower(), fetchType)] = cacheValue if isFromCache: - msg = "GETINFO %s (cache fetch)" % param + msg = "GETCONF %s (cache fetch)" % param log.log(CONFIG["log.torGetConfCache"], msg) else: - msg = "GETINFO %s (runtime: %0.4f)" % (param, time.time() - startTime) + msg = "GETCONF %s (runtime: %0.4f)" % (param, time.time() - startTime) log.log(CONFIG["log.torGetConf"], msg) self.connLock.release() @@ -1205,7 +1218,7 @@ if not issueSighup: try: self.conn.send_signal("RELOAD") - self._cachedParam = dict([(arg, None) for arg in CACHE_ARGS]) + self._cachedParam = {} self._cachedConf = {} except Exception, exc: # new torrc parameters caused an error (tor's likely shut down) @@ -1250,7 +1263,7 @@ if errorLine: raise IOError(" ".join(errorLine.split()[3:])) else: raise IOError("failed silently") - self._cachedParam = dict([(arg, None) for arg in CACHE_ARGS]) + self._cachedParam = {} self._cachedConf = {} except IOError, exc: raisedException = exc @@ -1401,12 +1414,10 @@ # if the message is informing us of our ip address changing then clear # its cached value - isAddrChangeEvent = False for prefix in ADDR_CHANGED_MSG_PREFIX: - isAddrChangeEvent |= msg.startswith(prefix) - - if isAddrChangeEvent and "address" in self._cachedParam: - del self._cachedParam["address"] + if msg.startswith(prefix): + self._cachedParam["address"] = None + break def _updateHeartbeat(self): """ @@ -1548,14 +1559,14 @@ lookups if true """ - currentVal = self._cachedParam[key] + currentVal = self._cachedParam.get(key) if currentVal != None: if currentVal == UNKNOWN: return default else: return currentVal self.connLock.acquire() - currentVal, result = self._cachedParam[key], None + currentVal, result = self._cachedParam.get(key), None if currentVal == None and self.isAlive(): # still unset - fetch value if key in ("nsEntry", "descEntry"): @@ -1750,7 +1761,7 @@ """ # resets cached GETINFO and GETCONF parameters - self._cachedParam = dict([(arg, None) for arg in CACHE_ARGS]) + self._cachedParam = {} self._cachedConf = {} # gives a notice that the control port has closed

1 0

r24530: {arm} Dropping config query cache hits from the log. (in arm/trunk: . src/interface/connections src/util)
by Damian Johnson 02 Apr '11

02 Apr '11

Author: atagar Date: 2011-04-02 01:47:53 +0000 (Sat, 02 Apr 2011) New Revision: 24530 Modified: arm/trunk/armrc.sample arm/trunk/src/interface/connections/connPanel.py arm/trunk/src/util/torTools.py Log: Dropping config query cache hits from the log. Modified: arm/trunk/armrc.sample =================================================================== --- arm/trunk/armrc.sample 2011-04-02 01:35:15 UTC (rev 24529) +++ arm/trunk/armrc.sample 2011-04-02 01:47:53 UTC (rev 24530) @@ -233,6 +233,7 @@ log.torGetInfo DEBUG log.torGetInfoCache NONE log.torGetConf DEBUG +log.torGetConfCache NONE log.torSetConf INFO log.torEventTypeUnrecognized NOTICE log.torPrefixPathInvalid NOTICE Modified: arm/trunk/src/interface/connections/connPanel.py =================================================================== --- arm/trunk/src/interface/connections/connPanel.py 2011-04-02 01:35:15 UTC (rev 24529) +++ arm/trunk/src/interface/connections/connPanel.py 2011-04-02 01:47:53 UTC (rev 24530) @@ -77,10 +77,6 @@ for entry in self._entries: if isinstance(entry, connEntry.ConnectionEntry): entry.getLines()[0].isInitialConnection = True - - # TODO: should listen for tor shutdown - # TODO: hasn't yet had its pausing functionality tested (for instance, the - # key handler still accepts events when paused) def setPaused(self, isPause): """ Modified: arm/trunk/src/util/torTools.py =================================================================== --- arm/trunk/src/util/torTools.py 2011-04-02 01:35:15 UTC (rev 24529) +++ arm/trunk/src/util/torTools.py 2011-04-02 01:47:53 UTC (rev 24530) @@ -75,6 +75,7 @@ "log.torGetInfo": log.DEBUG, "log.torGetInfoCache": None, "log.torGetConf": log.DEBUG, + "log.torGetConfCache": None, "log.torSetConf": log.INFO, "log.torPrefixPathInvalid": log.NOTICE, "log.bsdJailFound": log.INFO, @@ -569,9 +570,12 @@ elif fetchType == "map": cacheValue = dict(result) self._cachedConf[(param.lower(), fetchType)] = cacheValue - runtimeLabel = "cache fetch" if isFromCache else "runtime: %0.4f" % (time.time() - startTime) - msg = "GETCONF %s (%s)" % (param, runtimeLabel) - log.log(CONFIG["log.torGetConf"], msg) + if isFromCache: + msg = "GETINFO %s (cache fetch)" % param + log.log(CONFIG["log.torGetConfCache"], msg) + else: + msg = "GETINFO %s (runtime: %0.4f)" % (param, time.time() - startTime) + log.log(CONFIG["log.torGetConf"], msg) self.connLock.release()

1 0