Downgrade torsocks/tsocks dependency to a recommends.  That tool is not
needed if you only run a relay, or if you access Tor only using polipo
or privoxy.  The torify(1) wrapper that makes use of torsocks or tsocks
already handles their absense and emmits a proper message telling the
user what they are missing (closes: #595898).

* debian-merge: (62 commits)
  New upstream version
  best tor ever!
  I hear we are close to a release.  Clean up the whitespace.
  fold in the recent changes files
  Change 'bugfix on' line for changes/bug1921.
  perconnbwrate and perconnbwburst consensus params
  Demote a warn when enabling CellStatistics
  circwindow consensus param != CircWindow
  tor-spec.txt tweaks from arma
  Never queue a cell on a marked circuit
  Add a simple integer-ceiling-division macro before we get it wrong
  Extract the "do these routers have the same addr:orport" logic into a fn
  Tweak some issues found by arma in bug911 review.
  Make circuit_resume_edge_reading_helper treat streams more fairly.
  Add a max_cells arg to connection_edge_process_raw_inbuf
  Fix function declaration linebreaks at start of relay.c
  merge changes files for upcoming release
  Missing changes file for cc0efa80
  Update the changelog for the bug1525 fix
  Make authorities download consensuses if appropriate
  ...

* commit 'tor-0.2.2.16-alpha': (61 commits)
  best tor ever!
  I hear we are close to a release.  Clean up the whitespace.
  fold in the recent changes files
  Change 'bugfix on' line for changes/bug1921.
  perconnbwrate and perconnbwburst consensus params
  Demote a warn when enabling CellStatistics
  circwindow consensus param != CircWindow
  tor-spec.txt tweaks from arma
  Never queue a cell on a marked circuit
  Add a simple integer-ceiling-division macro before we get it wrong
  Extract the "do these routers have the same addr:orport" logic into a fn
  Tweak some issues found by arma in bug911 review.
  Make circuit_resume_edge_reading_helper treat streams more fairly.
  Add a max_cells arg to connection_edge_process_raw_inbuf
  Fix function declaration linebreaks at start of relay.c
  merge changes files for upcoming release
  Missing changes file for cc0efa80
  Update the changelog for the bug1525 fix
  Make authorities download consensuses if appropriate
  Clean up a couple more bug1138 issues mentioned by roger on code review
  ...

Karsten says: "the ChangeLog should say it's a bugfix on
0.2.2.15-alpha, because enabling stats while Tor is running (which
leads to this false log message) is only possible since then."

Sounds right enough to me.  Tell me if I'm wrong.

When the CellStatistics option is off, we don't store cell insertion
times. Doing so would also not be very smart, because there seem to
still be some performance issues with this type of statistics. Nothing
harmful happens when we don't have insertion times, so we don't need to
alarm the user.

aka update dir-spec.txt to reflect reality

Previously[*], the function would start with the first stream on the
circuit, and let it package as many cells as it wanted before
proceeding to the next stream in turn.  If a circuit had many live
streams that all wanted to package data, the oldest would get
preference, and the newest would get ignored.

Now, we figure out how many cells we're willing to send per stream,
and try to allocate them fairly.

Roger diagnosed this in the comments for bug 1298.

[*] This bug has existed since before the first-ever public release
    of Tor.  It was added by r152 of Tor on 26 Jan 2003, which was
    the first commit to implement streams (then called "topics").

    This is not the oldest bug to be fixed in 0.2.2.x: that honor
    goes to the windowing bug in r54, which got fixed in e50b7768 by
    Roger with diagnosis by Karsten.  This is, however, the most
    long-lived bug to be fixed in 0.2.2.x: the r54 bug was fixed
    2580 days after it was introduced, whereas I am writing this
    commit message 2787 days after r152.

I'm going to use this to implement more fairness in
circuit_resume_edge_reading_helper in an attempt to fix bug 1298.

(Updated with fixes from arma and Sebastian)

An authority should never download a consensus if it has a live one,
but when it doesn't, it should admit that it's not going to get one,
and see if anybody else can give it one.

Fixes 1300, fix on 0.2.0.9-alpha

Per arma's comments in bug1138

noticed while reviewing hoganrobert/bug1138

This cleans up some whitespace consistency issues and, more
importantly, gives you the ability to skip tests from the command
line.