Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-09-28 14:29:33 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix conflicts arising from the reuse_private_key branch

Browse source
This commit is contained in:
Miguel Jacq 2018-01-16 15:30:36 +11:00
commit f14521af6a
14 changed files with 178 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,9 +28,9 @@ import inspect, os, sys, hashlib, zipfile, io, shutil, subprocess
import urllib.request
def main():
dmg_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/7.0.10/TorBrowser-7.0.10-osx64_en-US.dmg'
dmg_filename = 'TorBrowser-7.0.10-osx64_en-US.dmg'
expected_dmg_sha256 = '2de32de962d14ecb55f8008078875f3d0b0875dba4a140726714e67ce329fe9a'
dmg_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/7.0.11/TorBrowser-7.0.11-osx64_en-US.dmg'
dmg_filename = 'TorBrowser-7.0.11-osx64_en-US.dmg'
expected_dmg_sha256 = '5143e4a2141a69f66869be13eef4bcaac4e6c27c78383fc8a4c38b334759f3a2'
# Build paths
root_path = os.path.dirname(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))

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

@ -28,9 +28,9 @@ import inspect, os, sys, hashlib, zipfile, io, shutil
import urllib.request
def main():
zip_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/7.0.10/tor-win32-0.3.1.8.zip'
zip_filename = 'tor-win32-0.3.1.8.zip'
expected_zip_sha256 = '101defd239cda42f364815e91809fad16b17f03843a169ffbeb8cb91183b6ba8'
zip_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/7.0.11/tor-win32-0.3.1.9.zip'
zip_filename = 'tor-win32-0.3.1.9.zip'
expected_zip_sha256 = 'faf28efb606455842bda66ca369287a116b6d6e5ad3720ebed9337da0717f1b4'
# Build paths
root_path = os.path.dirname(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))