* 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

Conflicts:

	ChangeLog
	configure.in
	contrib/tor-mingw.nsi.in
	src/win32/orconfig.h

Apparently this is not as obvious as I thought.

Conflicts:
	src/or/config.c
	src/or/test.c

From http://archives.seul.org/tor/relays/Mar-2010/msg00006.html :

   As I understand it, the bug should show up on relays that don't set
   Address to an IP address (so they need to resolve their Address
   line or their hostname to guess their IP address), and their
   hostname or Address line fails to resolve -- at that point they'll
   pick a random 4 bytes out of memory and call that their address. At
   the same time, relays that *do* successfully resolve their address
   will ignore the result, and only come up with a useful address if
   their interface address happens to be a public IP address.

Also, differentiate the two log messages.

I still feel like we should investigate this case. It seems odd.

- Make manpage building properly depend on patch-stamp,
- Fix building in the absence of a debian/micro-revision.i file.

Also break the build if that switch isn't used and asciidoc isn't
available.

We don't need sed for our string manipulation, so let's get rid of
it. Suggested by weasel.

Otherwise, the build process breaks when one of the .1.txt gets
a new mtime. Suggested by weasel.

Also we need at least asciidoc 8.2, which rules out dapper and
etch unless backports are used.  Fortunately the lenny version
installs directly on these.

Conflicts:
	src/common/test.h
	src/or/test.c

When the bandwidth-weights branch added the "directory-footer"
token, and began parsing the directory footer at the first
occurrence of "directory-footer", it made it possible to fool the
parsing algorithm into accepting unsigned data at the end of a
consensus or vote.  This patch fixes that bug by treating the footer
as starting with the first "directory-footer" or the first
"directory-signature", whichever comes first.

Conflicts:
	ChangeLog
	src/or/routerparse.c

diff.  The upstream bug has long since been fixed so we should probably
stop shipping our own copy of test.h

* debian-merge: (99 commits)
  Changefile cleanup
  Upstream tarballs no longer ship an AUTHORS file, or the website
  torify.1 manpage gets installed by upstream
  And stop it from falling over because it tries to call non-existant build scripts for building html files we do not need anyway
  Try to build manpages
  The original design paper is no longer shipped with Tor.
  Update how we patch manpages
  Removed versioned libssl build dependency since that is no longer needed
  New upstream version
  Mark 160 and 161 as Finished.
  elevate a changelog entry, and get my mailto out of the man page
  Make expand_filename into a tor_strdup() alias on windows.
  Remove some redundant code in options_save_current()
  Expand homedirs in paths passed to tor-checkkey
  Zero a cipher completely before freeing it
  Break early on unknown extendcircuit purpose
  Fix a memory leak, found by coverity
  Remove some redundand code in control.c
  Update the osx dmg creation instructions
  network-status-version must come first in a vote/consensus
  ...

Therefore remove them from debian/tor.docs.  No longer shipping
parts of the website also closes: #443560.  Also no longer distribute
doc/TODO and doc/HACKING in the debian package.