improved conjestion control
Merge branch 'stqism-master'
Merge branch 'net' of https://github.com/notsecure/ProjectTox-Core into notsecure-net
This one actually fixes Android, I tested it

Signed-off-by: Sean Qureshi <sean@tox.im>