Update format of upstream filename.

build_tor_macos.py

@@ -94,9 +94,9 @@ def compare_output_with_upstream(versions):
 def compare_with_upstream(versions, arch):
     tor_browser_version = versions['upstream']['tor-browser']
     libevent_version = versions['upstream']['libevent']
-    check_call(['wget', '-c', ('https://archive.torproject.org/tor-package-archive/torbrowser/{0}/'
-                + 'tor-expert-bundle-{0}-macos-{1}.tar.gz').format(tor_browser_version, arch)])
-    check_call(['tar', 'xvfz', 'tor-expert-bundle-{0}-macos-{1}.tar.gz'.format(tor_browser_version, arch),
+    package = 'tor-expert-bundle-macos-{0}-{1}.tar.gz'.format(arch, tor_browser_version)
+    check_call(['wget', '-c', 'https://archive.torproject.org/tor-package-archive/torbrowser/{0}/{1}'.format(tor_browser_version, package)])
+    check_call(['tar', 'xvfz', package,
                 '--one-top-level=upstream-' + arch, '--strip-components=1',
                 'tor/tor', 'tor/libevent-' + libevent_version + '.dylib'])
     hash_tor_upstream = get_sha256(os.path.join('upstream-' + arch, 'tor'))