mikey99 / tor Public

Modify eventdns to let us know which DNS server answered the
request. Save the IP of the DNS-hijacking server to the log.
Seems to be the solution to bug2455, but at another glance
perhaps every DNS server should be logged?
Anyhow the 'struct nameserver' pointer is passed from eventdns
to tor code now and can be utilized appropriately everywhere.

Conflicts:
	src/or/config.c
	src/or/dirserv.c
	src/or/or.h

It does what it says on the tin.  It turns out I'll want this in a couple
of places.

We'll eventually want to do more work here to make sure that the ports
are stable over multiple invocations.  Otherwise, turning your node on
and off will get you a new DirPort/ORPort needlessly.

Otherwise, it will just immediately close any port declared with "auto"
on the grounds that it wasn't configured.  Now, it will allow "auto" to
match any port.

This means FWIW if you configure a socks port with SocksPort 9999
and then transition to SocksPort auto, the original socksport will
not get closed and reopened.  I'm considering this a feature.

This is the major part of the implementation for trac issue 3076.

… bug 3080)

….2.2

…int-0.2.1

HTTPS error code 403 is now reported as:
"The https proxy refused to allow connection".
Used a switch statement for additional error codes to be explained
in the future.

If we do a replace-then-munmap, windows will never actually rewrite
the microdesc cache.

Found by wanoskarnet; bugfix on 0.2.2.6-alpha.

The new behavior is to try to rename the old file if there is one there
that we can't read.  In all likelihood, that will fail too, but at least
we tried, and at least it won't crash.

… memcmps

…_memcmp_023

Conflicts in various places, mainly node-related.  Resolved them in
favor of HEAD, with copying of tor_mem* operations from bug3122_memcmp_022.

	src/common/Makefile.am
	src/or/circuitlist.c
	src/or/connection_edge.c
	src/or/directory.c
	src/or/microdesc.c
	src/or/networkstatus.c
	src/or/router.c
	src/or/routerlist.c
	src/test/test_util.c