diff options
author | Micah Lee <micah@micahflee.com> | 2020-12-13 11:40:25 -0800 |
---|---|---|
committer | Micah Lee <micah@micahflee.com> | 2020-12-13 11:40:25 -0800 |
commit | b96b83905ba5b62c332a6c8946218ddae4c61517 (patch) | |
tree | f5a8fb5ade60583e12d07c657fde007c8ffe4ce0 /cli/onionshare_cli/onionshare.py | |
parent | ae621b4001dc44d7f07a9fad43376439b855ccd8 (diff) | |
parent | a520057bf4bd0956f03b763bfacdb8145cb5f977 (diff) | |
download | onionshare-b96b83905ba5b62c332a6c8946218ddae4c61517.tar.gz onionshare-b96b83905ba5b62c332a6c8946218ddae4c61517.zip |
Merge branch 'develop' into 929_download_errors
Diffstat (limited to 'cli/onionshare_cli/onionshare.py')
-rw-r--r-- | cli/onionshare_cli/onionshare.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cli/onionshare_cli/onionshare.py b/cli/onionshare_cli/onionshare.py index 6fead913..db15a03d 100644 --- a/cli/onionshare_cli/onionshare.py +++ b/cli/onionshare_cli/onionshare.py @@ -21,7 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. import os, shutil from . import common -from .onion import TorTooOld, TorErrorProtocolError from .common import AutoStopTimer |