Merge onionshare from upstream