Remove special zip timestamp, use get_tor_version.

build-tor.py

@@ -44,7 +44,7 @@ def main():
     jar_files = []
     for root, dirnames, filenames in os.walk(external_dir):
         for f in filenames: jar_files.append(os.path.join(root, f))
-    for file in jar_files: reset_time(file, zip=True)
+    for file in jar_files: reset_time(file)
     jar_name = get_sources_file_name(versions)
     jar_path = os.path.abspath(os.path.join(REPO_DIR, jar_name))
     rel_paths = [os.path.relpath(f, external_dir) for f in sorted(jar_files)]
@@ -168,10 +168,8 @@ def build_arch(name):
     check_call(['zip', '-X', name, 'tor'], cwd=REPO_DIR)
 
 
-def reset_time(filename, zip=False):
-    if zip: timestamp = '198001010000.00'
-    else: timestamp = '197001010000.00'
-    check_call(['touch', '--no-dereference', '-t', timestamp, filename])
+def reset_time(filename):
+    check_call(['touch', '--no-dereference', '-t', '197001010000.00', filename])
 
 
 if __name__ == "__main__":

verify-tor.py

@@ -3,7 +3,7 @@ import os
 import sys
 from subprocess import check_call, CalledProcessError
 
-from utils import REPO_DIR, get_sha256, fail, get_build_versions, get_final_file_name, get_version
+from utils import REPO_DIR, get_sha256, fail, get_build_versions, get_final_file_name, get_version, get_tor_version
 
 
 def main():
@@ -47,7 +47,7 @@ def main():
 
 
 def get_url(versions, fallback=False):
-    version = versions['tor'].split('-')[1]
+    version = get_tor_version(versions)
     file = get_final_file_name(versions)
     if not fallback:
         return "https://jcenter.bintray.com/org/briarproject/tor-android/%s/%s" % (version, file)