Merge branch 'master' into devel

ralphwetzel · Jan 30, 2017 · fe4ec8f · fe4ec8f
2 parents 4dbd49d + e10872c
commit fe4ec8f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/FreeBSD/theonionbox.sh b/FreeBSD/theonionbox.sh
@@ -50,3 +50,4 @@ start_cmd="/usr/sbin/daemon -u ${theonionbox_user} -p ${pidfile} ${command}"
 
 # Let's go!
 run_rc_command "$1"
+
diff --git a/theonionbox/stamp.txt b/theonionbox/stamp.txt
@@ -1 +1 @@
-20170130|210444
+20170130|210444
diff --git a/theonionbox/theonionbox.py b/theonionbox/theonionbox.py
@@ -2,8 +2,8 @@
 from __future__ import absolute_import
 from __future__ import print_function
 
-# __version__ = '3.0.1'      # stamp will be added later
 __version__ = '3.2'      # stamp will be added later
+
 __description__ = 'The Onion Box: WebInterface to monitor Tor Relays and Bridges'
 
 # from tob.version_tester import Version

diff --git a/theonionbox/tob/onionoo.py b/theonionbox/tob/onionoo.py
@@ -232,6 +232,7 @@ def _decode_history_object(self, name, key):
             # This Exception will be raised if a wrong 'name' was provided while programming
             # OR if the relay is so young that there are no historical infos in the onionoo data!
             self.log.warn("While decoding Onionoo history data: Key '{}' not found.".format(name))
+
             return None
 
         try: