Merge commit 'tor-0.2.2.16-alpha' into debian-merge

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