Merge commit 'origin/maint-0.2.1'

      controllers.

Changes in version 0.2.1.16-?? - 2009-??-??

Changes in version 0.2.1.16-rc - 2009-06-20

  o Security fixes:

    - Fix an edge case where a malicious exit relay could convince a

      controller that the client's DNS question resolves to an internal IP

  o Major performance improvements (on 0.2.0.x):

    - Disable and refactor some debugging checks that forced a linear scan

      over the whole server-side DNS cache. These accounted for over 50%

      of CPU time on a relatively busy exit node's gprof profile. Found by

      Jacob.

      of CPU time on a relatively busy exit node's gprof profile. Found

      by Jacob.

    - Disable some debugging checks that appeared in exit node profile

      data.

  o Minor features:

    - Update to the "June 3 2009" ip-to-country file.

    - Do not have tor-resolve automatically refuse all .onion addresses;

      if AutomapHostsOnResolve is set, this will work fine.

      if AutomapHostsOnResolve is set in your torrc, this will work fine.

  o Minor bugfixes (on 0.2.0.x):

    - Log correct error messages for DNS-related network errors on

      Windows.

    - Don't warn users about low port and hibernation mix when they

      provide a *ListenAddress directive to fix that. Bugfix on

      0.2.1.15-rc.

    - Fix a race condition that could cause crashes or memory

      corruption when running as a server with a controller listening

      for log messages.

    - Fix a race condition that could cause crashes or memory corruption

      when running as a server with a controller listening for log

      messages.

    - Avoid crashing when we have a policy specified in a DirPolicy or

      SocksPolicy or ReachableAddresses option with ports set on it, and we

      re-load the policy.  May fix bug 996.

      SocksPolicy or ReachableAddresses option with ports set on it,

      and we re-load the policy. May fix bug 996.

    - Hidden service clients didn't use a cached service descriptor that

      was older than 15 minutes, but wouldn't fetch a new one either,

      because there was already one in the cache. Now, fetch a v2

      descriptor unless the same descriptor was added to the cache within

      the last 15 minutes. Fixes bug 997; reported by Marcus Griep.

  o Minor bugfixes (on 0.2.1.x):

    - Don't warn users about low port and hibernation mix when they

      provide a *ListenAddress directive to fix that. Bugfix on

      0.2.1.15-rc.

    - When switching back and forth between bridge mode, do not start

      gathering GeoIP data until two hours have passed.

    - Do not complain that the user has requested an excluded node as