Micah Lee 51c8aa6687 Merge branch 'main' into release-2.6.1		2023-10-18 11:34:06 -07:00
..
resources	Update version to 2.6.1.dev1	2023-10-17 17:01:11 -07:00
web	Add trailing slash on directories in website mode to assist with relative asset links	2023-10-17 17:45:23 +11:00
__init__.py	Add QR code for private key, update tests	2023-10-09 16:01:38 +11:00
censorship.py	Treat censorship API returning None for bridge settings the same as if it doesn't return bridge settings (#1588)	2022-05-30 14:26:46 -07:00
common.py	Fix tor path again	2022-05-29 17:07:22 -07:00
meek.py	More verbose and consistent Meek exception logging	2022-03-22 14:29:02 +11:00
mode_settings.py	Merge branch 'ros-fixes' into release-2.5	2022-01-17 09:51:25 -08:00
onion.py	Remove meek workaround in Censorship Circumvention API's built-in bridges response	2022-03-28 10:45:23 +11:00
onionshare.py	Update copyright year to 2022	2022-01-16 16:15:49 -08:00
settings.py	Update locales	2023-09-05 08:52:46 -07:00