Merge branch 'bug30713_035' into bug30713_040

diff --cc .travis.yml
Simple merge

diff --cc src/test/test_rebind.py
index 7b12626a918d18069e4a35aa17852327d9d993fa,77829ca9200315eb3b568acafef2c7bd0882da60..232b2003265ab7d1e20eb4298260217e1c85095e
--- 1/src/test/test_rebind.py
--- 2/src/test/test_rebind.py
+++ b/src/test/test_rebind.py
@@@ -16,12 -16,15 +16,16 @@@ def fail(msg)
      logging.error('FAIL')
      sys.exit(msg)
  
+ def skip(msg):
+     logging.warning('SKIP: {}'.format(msg))
+     sys.exit(77)
+ 
  def try_connecting_to_socksport():
      socks_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 -    if socks_socket.connect_ex(('127.0.0.1', socks_port)):
 +    e = socks_socket.connect_ex(('127.0.0.1', socks_port))
 +    if e:
          tor_process.terminate()
 -        fail('Cannot connect to SOCKSPort')
 +        fail('Cannot connect to SOCKSPort: error ' + os.strerror(e))
      socks_socket.close()
  
  def wait_for_log(s):