Micah Lee 713e45084a

Merge branch '435_support_bridges' of https://github.com/mig5/onionshare into mig5-435_support_bridges

2018-01-17 16:19:30 -08:00

..

__init__.py

load the Settings in onionshare/__init__.py later, so that when saving slug, the private_key/hidservauth string have already been saved by the Onion object

2018-01-18 08:14:36 +11:00

common.py

Extract tor and obfs4proxy executables from the main TorBrowser executable with 7-zip on Windows

2018-01-17 12:45:37 +11:00

onion.py

Fix conflicts arising from the reuse_private_key branch

2018-01-16 15:30:36 +11:00

onionshare.py

Move the saving of private key into the SettingsDialog and Onion objects entirely (no QPushButton to save it)

2018-01-13 20:58:24 +11:00

settings.py

Fix conflicts arising from the reuse_private_key branch

2018-01-16 15:30:36 +11:00

socks.py

Various fixes

2015-07-25 11:22:24 +02:00

strings.py

Reorder imports, remove p, use ext, use json.load(f)

2017-07-10 20:11:04 -06:00

web.py

Save the slug when using a persistent private key

2018-01-15 10:01:34 +11:00