* commit 'tor-0.2.2.11-alpha': (30 commits)
  bump to 0.2.2.11-alpha
  gather together the 0.2.2.11-alpha changelog
  simplify a path in networkstatus
  Add --enable-static-zlib option
  Fix renegotiation on OpenSSL versions that backport RFC5746.
  Rename CircPriorityHalflifeMsec to CircuitPriorityHalflifeMsec
  testsuite: Prevent the main thread from starving the worker threads
  testsuite: Only free the main mutex when and if all the worker threads are done
  Log bandwidth_weight_rule_t as a string, not an integer.
  Fix a bug in reading CircPriorityHalflife from consensus
  fetch relay descriptors from v3 authorities
  Fix a segfault when a client is hup'd.
  fold in the recent changelog entries
  Mention libxml2-utils in our asciidoc dependencies
  Segfault less during consensus generation without params
  Add a missing NL to dir-spec.
  In the glorious future, all relays cache dir info.
  give us a blurb; add stanza to the releasenotes
  bump to 0.2.1.25
  fix some dangling refs in dirspec
  ...

Works like the --enable-static-openssl/libevent options. Requires
--with-zlib-dir to be set. Note that other dependencies might still
pull in a dynamicly linked zlib, if you don't link them in statically
too.

Our code assumed that any version of OpenSSL before 0.9.8l could not
possibly require SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION.  This is
so... except that many vendors have backported the flag from later
versions of openssl when they backported the RFC5476 renegotiation
feature.

The new behavior is particularly annoying to detect.  Previously,
leaving SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION unset meant that
clients would fail to renegotiate.  People noticed that one fast!
Now, OpenSSL's RFC5476 support means that clients will happily talk to
any servers there are, but servers won't accept renegotiation requests
from unpatched clients unless SSL_OP_ALLOW_etc is set.  More fun:
servers send back a "no renegotiation for you!" error, which unpatched
clients respond to by stalling, and generally producing no useful
error message.

This might not be _the_ cause of bug 1346, but it is quite likely _a_
cause for bug 1346.

Everything that accepted the 'Circ' name handled it wrong, so even now
that we fixed the handling of the parameter, we wouldn't be able to
set it without making all the 0.2.2.7..0.2.2.10 relays act wonky.
This patch makes Tors accept the 'Circuit' name instead, so we can
turn on circuit priorities without confusing the versions that treated
the 'Circ' name as occasion to act weird.

Conflicts:
	src/or/test.c

I'm adding this because I can never remember what stuff like 'rule 3'
means.  That's the one where if somebody goes limp or taps out, the
fight is over, right?

When you mean (a=b(c,d)) >= 0, you had better not say (a=b(c,d)>=0).
We did the latter, and so whenever CircPriorityHalflife was in the
consensus, it was treated as having a value of 1 msec (that is,
boolean true).

Conflicts:

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

People who have vidalia installed might not want to run Tor as a system
service. The vidalia .deb can ask them that and then set run-daemon
to no.
(cherry picked from commit 03b45a6f)

(cherry picked from commit e40d12aa)

We need to make sure we have an event_base in dns.c before we call
anything that wants one. Make sure we always have one in dns_reset()
when we're a client. Fixes bug 1341.

Zax from #tor noticed that while we list docbook-xsl and docbook-xml
in our helpful error text when making the docs fails, we forgot to
also list libxml2-utils. Let's add that.

If no authority votes on any params, Tor authorities segfault when
trying to make a new consensus from the votes. Let's change that.

Found by Oğuz

Now if you're a published relay and you set RefuseUnknownExits, even
if your dirport is off, you'll fetch dir info from the authorities,
fetch it early, and cache it.

In the future, RefuseUnknownExits (or something like it) will be on
by default.

it's perfect, let's ship it

* debian-merge: (52 commits)
  New upstream version
  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.
  ...

* 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

reported by atagar; fixes bug 1289.

If asciidoc is required, the user receives an error message telling
them about the --disable-asciidoc configure switch and the build
breaks.

now's your chance to destabilize it