109 Commits

Author	SHA1	Message	Date
Micah Lee	0c8d6cf91c	Fixed typo	2017-02-28 15:39:45 -08:00
Micah Lee	9ed7db9e3b	Merge branch 'master' of github.com:micahflee/onionshare	2017-02-23 15:11:36 -08:00
Micah Lee	b2b4730ac3	Version bump to 1.0, and updated changelog	2017-02-23 15:11:19 -08:00
Micah Lee	daad464647	Merge branch 'master' into tor-protocol-error	2017-02-23 08:44:02 -08:00
Micah Lee	58f49b6caa	Actually, version bump to 1.0dev1	2017-02-22 19:00:40 -08:00
Micah Lee	34301d3088	Catch Tor protocol error exceptions when starting an onion service (#344)	2017-02-22 16:45:52 -08:00
Micah Lee	6370139d2e	Rip out support for non-ephemeral onion services	2017-02-22 14:10:06 -08:00
Micah Lee	05319f7344	Merge branch 'master' into pyinstaller	2017-02-21 17:13:06 -08:00
Micah Lee	248f59cbd1	Renamed 'resources' to 'share', and updated location of 'share' files in OSX/Win binaries	2017-02-21 16:59:14 -08:00