diff options
| author | Micah Lee <micah@micahflee.com> | 2019-01-28 20:02:47 -0800 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2019-01-28 20:02:47 -0800 |
| commit | d986a348fd1987bb272f3016a777cd297cc74f8f (patch) | |
| tree | 6536d9c5859ea7abfcd7ac1988cdafadceb0db67 | |
| parent | b42f1c47b86f3ea671b3a937441febb82c07551e (diff) | |
| parent | 6d3302afb23b81a74d68d3c6e9b4aecf9a87bc9d (diff) | |
| download | onionshare-d986a348fd1987bb272f3016a777cd297cc74f8f.tar.gz onionshare-d986a348fd1987bb272f3016a777cd297cc74f8f.zip | |
Merge branch 'develop' into settings_crash
| -rw-r--r-- | install/get-tor-osx.py | 6 | ||||
| -rw-r--r-- | install/get-tor-windows.py | 6 | ||||
| -rw-r--r-- | onionshare/onion.py | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/install/get-tor-osx.py b/install/get-tor-osx.py index 61c2a4bf..d966173c 100644 --- a/install/get-tor-osx.py +++ b/install/get-tor-osx.py @@ -35,9 +35,9 @@ import subprocess import requests def main(): - dmg_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/8.0.4/TorBrowser-8.0.4-osx64_en-US.dmg' - dmg_filename = 'TorBrowser-8.0.4-osx64_en-US.dmg' - expected_dmg_sha256 = '44433ee2052cf3062e0dc29e640a6ae50db2775bc8939253f5f9d81614f2db07' + dmg_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/8.0.5/TorBrowser-8.0.5-osx64_en-US.dmg' + dmg_filename = 'TorBrowser-8.0.5-osx64_en-US.dmg' + expected_dmg_sha256 = '08f0f79181319b74f8ad3a3f8c72a46356ec47f1ca3e22eb42d92e51451d9411' # Build paths root_path = os.path.dirname(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) diff --git a/install/get-tor-windows.py b/install/get-tor-windows.py index e5a24be9..aad45e94 100644 --- a/install/get-tor-windows.py +++ b/install/get-tor-windows.py @@ -33,9 +33,9 @@ import subprocess import requests def main(): - exe_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/8.0.1/torbrowser-install-8.0.1_en-US.exe' - exe_filename = 'torbrowser-install-8.0.1_en-US.exe' - expected_exe_sha256 = 'bdf81d4282b991a6425c213c7b03b3f5c1f17bb02986b7fe9a1891e577e51639' + exe_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/8.0.5/torbrowser-install-8.0.5_en-US.exe' + exe_filename = 'torbrowser-install-8.0.5_en-US.exe' + expected_exe_sha256 = '860fdd06e4ea8dd4c46f221676251f5cc528676d4e256559ee3831a5f97492f1' # Build paths root_path = os.path.dirname(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) working_path = os.path.join(os.path.join(root_path, 'build'), 'tor') diff --git a/onionshare/onion.py b/onionshare/onion.py index c747984e..4d9cbacf 100644 --- a/onionshare/onion.py +++ b/onionshare/onion.py @@ -411,7 +411,7 @@ class Onion(object): # Does this version of Tor support next-gen ('v3') onions? # Note, this is the version of Tor where this bug was fixed: # https://trac.torproject.org/projects/tor/ticket/28619 - self.supports_v3_onions = self.tor_version >= Version('0.4.0.0') + self.supports_v3_onions = self.tor_version >= Version('0.3.5.7') def is_authenticated(self): """ |