conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-10-20	1	-2/+3
\|\
* \|	Fixes FS#146: Remove Tor-Support	steckbrief	2016-03-02	1	-8/+4
* \|	Imports organized	steckbrief	2016-02-12	1	-6/+0
* \|	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	1	-54/+33
\|\ \
\| * \|	refactored socks5 connection code. make jingle transport use that new code	Daniel Gultsch	2015-12-01	1	-29/+13
\| * \|	initial tor support	Daniel Gultsch	2015-12-01	1	-1/+5
\| * \|	put wake locks on out of band file transfers	Daniel Gultsch	2015-08-10	1	-24/+13
\| * \|	enable axolotl encryption for jingle supported file transfers	Daniel Gultsch	2015-08-01	1	-3/+3
\| * \|	use gcm for file encryption over http	Daniel Gultsch	2015-07-29	1	-2/+2
\| * \|	use a 20s timeout on socks5 connections	Daniel Gultsch	2015-05-18	1	-2/+5
\| * \|	always log reason for failed file transfer	Daniel Gultsch	2015-05-14	1	-0/+12
\| * \|	cleaned up file handling	Daniel Gultsch	2015-04-25	1	-10/+7
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-10	1	-2/+1
\|\ \ \ \| \| \|/ \| \|/\|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-02	1	-10/+10
\|\\| \|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-06	1	-2/+4
\|\\| \|
\| * \|	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	1	-234/+0
\| \|/
* /	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	1	-12/+24
\|/
*	better cleanup after unsuccesful transfers	iNPUTmice	2014-11-15	1	-0/+14
*	progress for ibb transfers	iNPUTmice	2014-11-15	1	-2/+2
*	basic arbitrary file transfer	iNPUTmice	2014-11-15	1	-0/+8
*	Rework `Account.getJid()' to return full JIDs	Sam Whited	2014-11-09	1	-2/+2
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+212