Merge branch 'master' into gui

This commit is contained in:
Micah Lee 2014-05-30 00:27:01 -04:00
commit 680dc43a97

View File

@ -14,7 +14,7 @@ if sys.argv[-1] == 'publish':
setup(
name='onionshare',
version='0.1',
version='0.2',
description='OnionShare lets you securely and anonymously share a file of any size with someone. It works by starting a web server, making it accessible as a Tor hidden service, and generating an unguessable URL to access and download the file.',
long_description="""OnionShare lets you securely and anonymously share a file of any size with someone. It works by starting a web server, making it accessible as a Tor hidden service, and generating an unguessable URL to access and download the file. It doesn't require setting up a server on the internet somewhere or using a third party filesharing service. You host the file on your own computer and use a Tor hidden service to make it temporarily accessible over the internet. The other user just needs to use Tor Browser to download the file from you.""",
author='Micah Lee',