Conflicts:
	src/common/address.c
	src/or/config.c

(Not a bugfix on any Tor release; before 10801_024, it didn't handle
portless addresses at all.)

Also rename a function to be more accurate (resolve->resolved)

Also, stop accepting the old kind of RESOLVED cells with no TTL
fields; they haven't been sent since 0.1.1.6-alpha.

This patch won't work without the fix to #10468 -- it will break
DNSPorts unless they set the proper ipv4/6 flags on entry_connection_t.

No other changes have been made; only code has been moved.

Conflicts:
	src/or/dirserv.c

We are searching @CONFDIR@ before $HOME, but the documentation
implied otherwise.

I screwed this up in f5e86bcd, when I
first documented the $HOME/.torrc possibility.

Fix for bug 9213; bugfix on 0.2.3.18-rc.

Conflicts:
	src/or/config.c

Subtracting two time_t values was yielding something that maybe
can't be fit in an int.

Bugfix on 0389d4aa; bug not in any released Tor.

Otherwise, it could mung the thing that came over the net on windows,
which would defeat the purpose of recording the unparseable thing.

Fixes bug 11342; bugfix on 0.2.2.1-alpha.

This improves the accuracy of the function/variable names.