Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into settings_crash

Browse Source
This commit is contained in:
Micah Lee 2019-01-28 20:02:47 -08:00
commit d986a348fd
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install/get-tor-osx.py
View File

@ -35,9 +35,9 @@ import subprocess
import requests import requests
def main(): def main():
dmg_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/8.0.4/TorBrowser-8.0.4-osx64_en-US.dmg' 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.4-osx64_en-US.dmg' dmg_filename = 'TorBrowser-8.0.5-osx64_en-US.dmg'
expected_dmg_sha256 = '44433ee2052cf3062e0dc29e640a6ae50db2775bc8939253f5f9d81614f2db07' expected_dmg_sha256 = '08f0f79181319b74f8ad3a3f8c72a46356ec47f1ca3e22eb42d92e51451d9411'
# Build paths # Build paths
root_path = os.path.dirname(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) root_path = os.path.dirname(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))

6
install/get-tor-windows.py
View File

@ -33,9 +33,9 @@ import subprocess
import requests import requests
def main(): def main():
exe_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/8.0.1/torbrowser-install-8.0.1_en-US.exe' 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.1_en-US.exe' exe_filename = 'torbrowser-install-8.0.5_en-US.exe'
expected_exe_sha256 = 'bdf81d4282b991a6425c213c7b03b3f5c1f17bb02986b7fe9a1891e577e51639' expected_exe_sha256 = '860fdd06e4ea8dd4c46f221676251f5cc528676d4e256559ee3831a5f97492f1'
# Build paths # Build paths
root_path = os.path.dirname(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) 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') working_path = os.path.join(os.path.join(root_path, 'build'), 'tor')

2
onionshare/onion.py
View File

@ -411,7 +411,7 @@ class Onion(object):
# Does this version of Tor support next-gen ('v3') onions? # Does this version of Tor support next-gen ('v3') onions?
# Note, this is the version of Tor where this bug was fixed: # Note, this is the version of Tor where this bug was fixed:
# https://trac.torproject.org/projects/tor/ticket/28619 # 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): def is_authenticated(self):
""" """