Conflicts:
	ChangeLog
	configure.in
	contrib/tor-mingw.nsi.in
	src/or/config.c
	src/win32/orconfig.h

backport of c43859c5
backport of 0d13e0ed

Partial backport of 381766ce.
Partial backport of 56c6d785.

When we tried to use the deprecated non-threadsafe evdns
interfaces in Libevent 2 without using the also-deprecated
event_init() interface, Libevent 2 would sensibly crash, since it
has no guess where to find the Libevent library.

Here we use the evdns_base_*() functions instead if they're
present, and fake them if they aren't.

Peter Palfrader authored Oct 11, 2009 and Nick Mathewson committed Oct 11, 2009

The test suite need the test.h file to build. Add it to
noinst_HEADERS in the Makefile.am so it gets included
in the tarball that make dist produces.

Peter Palfrader authored Oct 11, 2009 and Nick Mathewson committed Oct 10, 2009

tinytest_main() returns 0 on success, -1 on errors and 1 on test
failures.  So test.c should check on !=0 instead of <0.

This is a possible fix for bug 1023, where if we vote (or make a v2
consensus networkstatus) right after we come online, we can call
rep_hist_note_router_unreachable() on every router we haven't connected
to yet, and thereby make all their uptime values reset.

"neonomad" pointed out on or-talk that the order is opposite from the
intuitive order. explain why. we chose to fix the spec rather than the
code because there are controllers like torflow that already expect
the current behavior.

i think this doesn't actually affect anything, since linked
conns usually don't impact buckets

This was introduced in f7e6e852.
Found by Coverity

There were however other places where we used to call this
function that might have caused this to fire. Better
safe than sorry now.

This seems to be happening to me a lot on a garbage DSL line.
We may need to come up with 2 threshholds: a high short onehop
count and a lower longer count.

Pretimeouts may have build time data, just no timeout data.

Don't count one-hop circuits when we're estimating how long it
takes circuits to build on average. Otherwise we'll set our circuit
build timeout lower than we should. Bugfix on 0.2.2.2-alpha.

we made anybody who has 20KB/s Fast by definition, in 0.2.1.14-rc,
but it looks like we forgot to fix the spec.