[tor-commits] [arm/master] Hotfix for the 1.4.1 release:

[sebastian at torproject.org]

commit 4794d9275c50f3cfb850e8bfbfde828bafe53dd4
Merge: 95e0106 9b1b7b5
Author: Damian Johnson <atagar at torproject.org>
Date:   Wed Jan 12 04:56:09 2011 +0000

    Hotfix for the 1.4.1 release:
    change: including platform, python version, and arm/tor configurations in debug dumps
    change: adding summaries for server config options
    fix: properly parse the ps field when displaying decimal seconds (patch by Fabian)
    fix: error when initial recource lookups fail (caught by Trystero)
    
    
    
    svn:r24064

 ChangeLog            |    2 +-
 TODO                 |    9 ++++---
 armrc.sample         |    1 +
 src/settings.cfg     |   34 +++++++++++++++++++++++++++++
 src/starter.py       |   57 ++++++++++++++++++++++++++++++++++++++++++++++++-
 src/util/sysTools.py |   24 ++++++++++++++-------
 src/util/uiTools.py  |    5 +++-
 src/version.py       |    4 +-
 8 files changed, 118 insertions(+), 18 deletions(-)

diff --cc src/version.py
index 1306ee9,f6e1269..ddd3748
--- a/src/version.py
+++ b/src/version.py
@@@ -2,6 -2,6 +2,6 @@@
  Provides arm's version and release date.
  """
  
- VERSION = '1.4.1'
- LAST_MODIFIED = "January 7, 2011"
 -VERSION = '1.4.1_dev'
 -LAST_MODIFIED = "January 7, 2011"
++VERSION = '1.4.1.1'
++LAST_MODIFIED = "January 11, 2011"