Fixed geoip, retry on hidden services & more java code - java doesn't work

This is just a backup.