gnu: tor: Upgrade to 0.2.4.21. * gnu/packages/tor.scm (tor): Upgrade to 0.2.4.21.
Merge branch 'master' into core-updates Conflicts: gnu-system.am
gnu: tor: Upgrade to 0.2.4.20. * gnu/packages/tor.scm (tor): Upgrade to 0.2.4.20.
gnu: tor: Upgrade to 0.2.4.19. * gnu/packages/tor.scm (tor): Upgrade to 0.2.4.19.
gnu: Add Privoxy. * gnu/packages/tor.scm (privoxy): New variable.
gnu: Add torsocks. * gnu/packages/tor.scm (torsocks): New variable.
gnu: Add Tor. * gnu/packages/tor.scm: New file. * Makefile.am (MODULES): Add it.