[tor-commits] [arm/master] Hotfix to pick up r24560 (crashing issue when there's extra spacing in the HiddenServicePort config option)

[sebastian at torproject.org]

commit e11b597f2f9e10c5ddc173a32c9c080d1d886179
Author: Damian Johnson <atagar at torproject.org>
Date:   Tue Apr 5 02:44:58 2011 +0000

    Hotfix to pick up r24560 (crashing issue when there's extra spacing in the HiddenServicePort config option)
    
    
    
    svn:r24562
---
 ChangeLog            |    8 +++++++-
 src/util/torTools.py |    2 +-
 src/version.py       |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8f7f0bb..bee46bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 CHANGE LOG
 
-4/4/11 - version 1.4.2
+4/4/11 - version 1.4.2 (r24555)
 This release chiefly consists of a fully reimplemented connection panel. Besides being a sane, maintainable implementation this includes numerous new features and improvements like full circuit paths, applications involved for local connections, and better type identification.
 
     * added: full rewrite of the connection panel, providing:
@@ -47,6 +47,7 @@ This release chiefly consists of a fully reimplemented connection panel. Besides
     * fix: the 'startup.dataDirectory' config option was being ignored
     * fix: recognizing the proper private ip ranges of the 172.* block
     * fix: missing 'is default' option from config sort ordering
+    * fix (4/4/11): hidden service parsing issue when there's multiple spaces in the HiddenServicePort opition (caught by Nicolas Pouillard)
 
 1/7/11 - version 1.4.1 (r24054)
 Platform specific enhancements including BSD compatibility and vastly improved performance on Linux.
@@ -89,6 +90,11 @@ Platform specific enhancements including BSD compatibility and vastly improved p
     * fix: connection resolution wasn't finding results if tor was running under a different name
     * fix: brought all Linux connection resolvers into parity (established tcp connections only)
     * fix: commands with quoted pipes were being mis-parsed by the sysTools' call function
+    * fix (1/11/11, r24064): including platform, python version, and arm/tor configurations in debug dumps
+    * fix (1/11/11, r24064): properly parse the ps field when displaying decimal seconds (patch by Fabian)
+    * fix (1/11/11, r24064): error when initial resource lookups fail (caught by Trystero)
+    * fix (1/12/11, r24075): decimal seconds in the ps uptime field were being misparsed (patch by Fabian)
+    * fix (1/15/11, r24092): adding a --docPath argument to help Gentoo ebuilds (https://bugs.gentoo.org/349792)
 
 11/27/10 - version 1.4.0 (r23873)
 Introducing a new page for managing tor's configuration, along with several other improvements.
diff --git a/src/util/torTools.py b/src/util/torTools.py
index cbdf900..696e712 100644
--- a/src/util/torTools.py
+++ b/src/util/torTools.py
@@ -1750,7 +1750,7 @@ class Controller(TorCtl.PostEventListener):
             
             if " " in hsEntry:
               # parses the target, checking if it's a port or IP:Port combination
-              hsTarget = hsEntry.split(" ")[1]
+              hsTarget = hsEntry.split()[1]
               
               if ":" in hsTarget:
                 hsPort = hsTarget.split(":")[1] # target is the IP:Port
diff --git a/src/version.py b/src/version.py
index a86b0bb..ee7c493 100644
--- a/src/version.py
+++ b/src/version.py
@@ -2,6 +2,6 @@
 Provides arm's version and release date.
 """
 
-VERSION = '1.4.2'
+VERSION = '1.4.2.1'
 LAST_MODIFIED = "April 4, 2011"