the theory is that the bots that are scraping bridgedb were scraping his
ipv6 bridge too, since they look for ^bridge

If RECAPTCHA_* configuration options are not present in bridgedb.conf,
bridgedb disables recaptcha support.

Call the correct function name.
cleanWarnedBridges() renamed to cleanWarnedEmails()

use correct text for blocked bridges
this didn't get changed when merging.

bridgedb.Server tries to graciously import GeoIP support, but because
logging is not yet configured at import time Python creates a default
handler that goes to the console and ignores further basicConfig calls

See also:
http://stackoverflow.com/questions/1943747/ \
python-logging-before-you-run-logging-basicconfig

Our solution is to relocate the import so that configureLogging() is
called first.

This set of changes adds recaptcha support to bridgedb.
The implementation proxies responses from clients to
preserve their privacy.

This set of changes implements email rate-limiting for the
EmailBasedDistributor. Abusers are warned, and then temporarily
blacklisted.

This set of changes allows bridgedb to filter responses
by country; if a bridge is known to be blocked in a country
it can be filtered from the set of returned bridges.

The BridgeDB specification is meant as a description what the current
BridgeDB code does, not what a compatible BridgeDB implementation is
expected to do.

    - Don't append to bucket files, overwrite existing files if necessary.

    - Don't re-assign buckets when its not necessary.

With this patch we dump the list of currently running bridges with
information about their assigned rings, subrings, and file buckets to a
local file.  The idea is to publish sanitized versions of these assignment
files and analyze how the assignment affects a bridge's usage.

The assignment file is written on startup and after receiving a HUP signal
and parsing new bridge descriptors.  Note that the assignments file is not
updated when bridges are dumped to file buckets; in that case the changed
assignments to file buckets will be reflected in the assignments file
after the next HUP.

Also note that the assignment file only contains bridges that are believed
to be running from parsing the last network status.  As a result, bridges
that are contained in file buckets, but that are not believed to be
running, won't be contained in the assignment file.

- Install translations to ~/ by default instead of /usr
- Use ~ as prefix by default
- Make sure pseudo distributors don't end up as actual ring names