Revert "Also pull tor-geoipdb from the Tor project's tor-experimental-0.2.5.x-wheezy suite."

This reverts commit 748e9e07c52847a00a45fadfef314b01c7f72f1a.

The stable APT suites now ship 0.2.5.8-rc, which is higher than the
0.2.5.7-rc found in the experimental ones.
Revert "Install Tor 0.2.5.x."

This reverts commit 9f18b5083ae06968674fcf082dcb32a53bb88b26.

The stable APT suites now ship 0.2.5.8-rc, which is higher than the
0.2.5.7-rc found in the experimental ones.
Merge remote-tracking branch 'origin/devel' into feature/tor-0.2.5.x-alpha
Merge branch 'feature/tor-0.2.5.x-alpha' into experimental