3 commits

Author	SHA1	Message	Date
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