Merge branch '685_use_dist_socks' of https://github.com/mig5/onionshare into mig5-685_use_dist_socks

This commit is contained in:
Micah Lee 2018-09-14 18:40:26 -07:00
commit 2605967011
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
4 changed files with 2 additions and 533 deletions

View file

@ -19,9 +19,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
from PyQt5 import QtCore
import datetime, time, socket, re, platform
import socks
from distutils.version import LooseVersion as Version
from onionshare import socks
from onionshare.settings import Settings
from onionshare.onion import Onion