- Fix setting to 'never' (ticket #523)
    - Fix always saying trusted keys changed
    - Parameterize tags

public domain

  * Increase default max tunnels
  * Cleanups after review
  * Exorcism (ticket #476)

     and 'ae0b80d9420ce8dcb103095523b98072eada7fa0'

created by me, public domain

     and 'f9376186d4f489e9726b6750637385b0450f8957'

    - Restore ovh reseeds, thx mathiasdm
  * Tunnels:
    - For expl. tunnels, fall back to high cap sooner
    - Tweak build rejections for class N

  * Translation updates from Transifex:
    - I2PSnark: de, es, and pt
    - I2PTunnel: de and es
    - RouterConsole: de and es
    - SusiDNS: de and es
    - SusiMail: de and es

GeoIP update based on Maxmind GeoLite Country database from 2011-10-07.

    - Out-of-order JobQueue 3nd try to fix
    - Lower timeouts

    - Update host lists
    - Switch back to https by default