in case Make on openirix128 can't handle it otherwise

* debian-merge: (21 commits)
  Bump version to 0.2.1.17-rc
  Make "Invalid onion hostname" msg respect SafeLogging.
  updated rpm instructions for realtime libevent.
  Revise 0.2.1.17-rc changelog.
  Make an attempt to fix bug 1024.
  Update the year for the copyright statement in two more files
  another minor patch to add to 0.2.1.x
  and give the bug 969 fixes a changelog
  the third piece of bug 969 fixing
  the second piece of bug 969 fixing
  the first piece of bug 969 fixing
  Have eventdns set the "truncated" bit correctly.
  stop capping bandwidths we see in the consensus
  Added ChangeLog entry for control port fix
  Ignore control port commands after a QUIT
  Flush long replies over control port on QUIT
  add a changelog entry: clients use bw in consensus
  Clients now use bandwidth values in the consensus
  Serve DirPortFrontPage even if the write bucket	is low.
  Add warning that the results of --enable-geoip-stats are different from those in master.
  ...

* commit 'tor-0.2.1.17-rc': (21 commits)
  Bump version to 0.2.1.17-rc
  Make "Invalid onion hostname" msg respect SafeLogging.
  updated rpm instructions for realtime libevent.
  Revise 0.2.1.17-rc changelog.
  Make an attempt to fix bug 1024.
  Update the year for the copyright statement in two more files
  another minor patch to add to 0.2.1.x
  and give the bug 969 fixes a changelog
  the third piece of bug 969 fixing
  the second piece of bug 969 fixing
  the first piece of bug 969 fixing
  Have eventdns set the "truncated" bit correctly.
  stop capping bandwidths we see in the consensus
  Added ChangeLog entry for control port fix
  Ignore control port commands after a QUIT
  Flush long replies over control port on QUIT
  add a changelog entry: clients use bw in consensus
  Clients now use bandwidth values in the consensus
  Serve DirPortFrontPage even if the write bucket	is low.
  Add warning that the results of --enable-geoip-stats are different from those in master.
  ...

Patch by Roger; fixes bug 1027.

Karsten Loesing authored Jun 30, 2009 and Nick Mathewson committed Jul 02, 2009

The internal error "could not find intro key" occurs when we want to send
an INTRODUCE1 cell over a recently finished introduction circuit and think
we built the introduction circuit with a v2 hidden service descriptor, but
cannot find the introduction key in our descriptor.

My first guess how we can end up in this situation is that we are wrong in
thinking that we built the introduction circuit based on a v2 hidden
service descriptor. This patch checks if we have a v0 descriptor, too, and
uses that instead.

Roger Dingledine authored Jun 30, 2009 and Nick Mathewson committed Jun 30, 2009

  o Minor features:
    - If we're a relay and we change our IP address, be more verbose
      about the reason that made us change. Should help track down
      further bugs for relays on dynamic IP addresses.

Roger Dingledine authored Jun 20, 2009 and Nick Mathewson committed Jun 30, 2009

when we write out our stability info, detect relays that have slipped
through the cracks. log about them and correct the problem.

if we continue to see a lot of these over time, it means there's another
spot where relays fall out of the routerlist without being marked as
unreachable.

Roger Dingledine authored Jun 20, 2009 and Nick Mathewson committed Jun 30, 2009

whenever we remove a relay from the main routerlist, tell the
rephist module that it's no longer running.

Roger Dingledine authored Jun 20, 2009 and Nick Mathewson committed Jun 30, 2009

tell the rephist module that a given relay is down whenever
we determine that it's down, not just when we thought it used
to be up.

Fixed bug 1022; This isn't actually a live bug in Tor, since in Tor
we never generate large DNS replies.

Roger Dingledine authored Jun 25, 2009 and Nick Mathewson committed Jun 25, 2009

but continue capping bandwidths we see in local server
descriptors, if we have no consensus weights for them.

When a QUIT has been issued on a control port connection, then
ignore further commands on that port. This fixes bug 1016.

Marks the control port connection for flushing before closing when
the QUIT command is issued. This allows a QUIT to be issued during
a long reply over the control port, flushing the reply and then
closing the connection. Fixes bug 1015.

Roger Dingledine authored Jun 21, 2009 and Nick Mathewson committed Jun 22, 2009

rather than the bandwidth values in each relay descriptor. This approach
opens the door to more accurate bandwidth estimates once the directory
authorities start doing active measurements. Implements more of proposal
141.

arma's rationale: "I think this is a bug, since people intentionally
set DirPortFrontPage, so they really do want their relay to serve that
page when it's asked for. Having it appear only sometimes (or roughly
never in Sebastian's case) makes it way less useful."

Fixes bug 1013; bugfix on 0.2.1.8-alpha.

* 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.
  ...

* commit 'tor-0.2.1.16-rc': (31 commits)
  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.
  Clean up a bit of C logic, and fix an erroneous warning.
  Consider *ListenAddress when warning about low ports and hibernation
  ...