[tor-commits] [arm/master] Hotfix for r24613 (release 1.4.2.3)

[sebastian at torproject.org]

commit 855ccf62986c1db2e1f0e42b5a1498a2c3d1f61a
Author: Damian Johnson <atagar at torproject.org>
Date:   Wed Apr 13 14:58:56 2011 +0000

    Hotfix for r24613 (release 1.4.2.3)
    
    
    
    svn:r24614
---
 src/interface/connections/connEntry.py |    2 +-
 src/version.py                         |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/interface/connections/connEntry.py b/src/interface/connections/connEntry.py
index 3f4ec6b..1c2543f 100644
--- a/src/interface/connections/connEntry.py
+++ b/src/interface/connections/connEntry.py
@@ -368,7 +368,7 @@ class ConnectionLine(entries.ConnectionPanelLine):
       # known relay then it might be client traffic
       
       conn = torTools.getConn()
-      if "Guard" in conn.getMyFlags() or conn.getOption("BridgeRelay") == "1":
+      if "Guard" in conn.getMyFlags([]) or conn.getOption("BridgeRelay") == "1":
         allMatches = conn.getRelayFingerprint(self.foreign.getIpAddr(), getAllMatches = True)
         return allMatches == []
     elif myType == Category.EXIT:
diff --git a/src/version.py b/src/version.py
index 81a5d88..4c0bbc8 100644
--- a/src/version.py
+++ b/src/version.py
@@ -2,6 +2,6 @@
 Provides arm's version and release date.
 """
 
-VERSION = '1.4.2.2'
-LAST_MODIFIED = "April 6, 2011"
+VERSION = '1.4.2.3'
+LAST_MODIFIED = "April 13, 2011"