Made the keys section of settings_load more readable in settings.c
Merge branch 'jdp5087-tour'
add HTTP proxy support
update man page
Merge branch 'master' into debian/unstable
prepare for release

Signed-off-by: Kill Your TV <killyourtv@i2pmail.org>
Merge tag 'debian/0.5.2+20141227.r1442-1' into ubuntu/trusty

toxic Debian release 0.5.2+20141227.r1442-1
prepare for release

Signed-off-by: Kill Your TV <killyourtv@i2pmail.org>