Merge branch 'devel'
Remove client debug logging
Bump version number to 2.60.42.
Autodiscover globaleaks packages in setup.py.

Use setuptools' package discovery helper function instead of manually updating
the list on setup.py.
This fixes the missing globaleaks.models modules in "packages" on setup().
Change {owner,permission} in /var/globaleaks anyway.

Fix bin/gl-fix-permissions: shrink it, and make it so that owner and permissions
are forcefully changed on each run.
Restart tor after changing its configuration, in postinst.
Merge branch 'devel'
Apply backward compatible torrc already-edited detection
Correct some english sentence
Pip should be installed on distributions that need it
Revert "Pip should be installed on distributions that need it"

This reverts commit 374935d02240039373d496c3b4e9d664deab2635.
Remove function included due to wrong merge
Fix: Add field_desc to encrypted comment __init__
Added changelog file
Edit changelog removed wrong entries
Update translations
Bump to version 2.60.43
Merge remote-tracking branch 'origin/devel'
Merge branch 'master' into release/debian/wheezy