Merge branch 'maint-0.3.5'

diff --cc src/test/test_rebind.py
index 2f366b2716e5bff0d347499d9d5d4f09327091da,2215b42253d8ffeedeaeecc9d98c1cf278419e8e..6f759b717e3cdd3b86a6841b6451e2275e6b9c37
--- 1/src/test/test_rebind.py
--- 2/src/test/test_rebind.py
+++ b/src/test/test_rebind.py
@@@ -67,21 -73,16 +73,23 @@@ socks_port = pick_random_port(
  assert control_port != 0
  assert socks_port != 0
  
 +if len(sys.argv) < 3:
 +     fail('Usage: %s <path-to-tor> <data-dir>' % sys.argv[0])
 +
  if not os.path.exists(sys.argv[1]):
      fail('ERROR: cannot find tor at %s' % sys.argv[1])
 +if not os.path.exists(sys.argv[2]):
 +    fail('ERROR: cannot find datadir at %s' % sys.argv[2])
  
  tor_path = sys.argv[1]
 +data_dir = sys.argv[2]
  
  tor_process = subprocess.Popen([tor_path,
 +                               '-DataDirectory', data_dir,
                                 '-ControlPort', '127.0.0.1:{}'.format(control_port),
                                 '-SOCKSPort', '127.0.0.1:{}'.format(socks_port),
+                                '-Log', 'debug stdout',
+                                '-LogTimeGranularity', '1',
                                 '-FetchServerDescriptors', '0'],
                                 stdout=subprocess.PIPE,
                                 stderr=subprocess.PIPE)