* commit 'tor-0.2.2.10-alpha': (51 commits)
  prepare 0.2.2.10-alpha for release
  clean up the 0.2.1.25 changelog
  Clarify that CRLF means "A CR then an LF".  Explain what those are.
  commit my annotations while i was hunting down the host order bug
  Apply Roger's bug 1269 fix.
  Woops, forgot the second warn.
  Add proposal 170 "Configuration options regarding circuit building"
  Demote warn to info, since it can happen.
  Note an exception to when we use OutboundBindAddress
  Backport fix for time-goes-forward test.  Fix bug 1267
  Add configure switch to disable use of asciidoc
  Simplify asciidoc-helper
  Ship the asciidoc-helper file in our tarballs
  Update copyright dates for files not in maint-0.2.1
  Update Tor Project copyright years
  Fix a consensus-extension bug found by outofwords
  fix some wide lines in routerparse.c
  Properly handle non-terminated strings
  Check for empty smartlists and no bandwidth during node selection.
  Don't segfault when checking the consensus
  ...

Conflicts:

	debian/src-test-test.h