Merge branch 'debian-merge' into debian

Merge branch 'debian-merge' into debian

* debian-merge: (33 commits)
  Forward port 06_add_compile_time_defaults
  New upstream version
  Bump version to 0.2.1.16-rc
  prepare changelog for 0.2.1.16-rc
  Better fix for 997.
  Revert "Backport fix for bug 997."
  tor-resolve: Don't automatically refuse .onion addresses.
  Backport fix for bug 997.
  Revise earlier check for correct IPv4 addr length to check for ==4.
  Check answer_len in the remap_addr case of process_relay_cell_not_open.
  update requirements to openssl 0.9.7
  Missing changelog entry about geoip
  Move and fix a changelog entry.  Noticed by optimist.
  Avoid a memory corruption problem related to "private" in DirPolicy.
  Update the rest of the geoip file.
  Update the geoip file
  Fix gprof bottlenecks on exit nodes found by Jacob.
  Do not report a node as a "chosen exit" when it is not in fact an exit.
  Make the second argument to routerset_contains_extendinfo const
  Don't attempt to log messages to a controller from a worker thread.
  ...