Because in 95 years, we or our successors will surely care about
enforcing the BSD license terms on this code.  Right?

I concatenated the remaining changes/* files, removed them, made the
headings more uniform, then told format_changelog.py to sort,
collate, and wrap them.

(This means that changes/* is now "everything that changed since
0.2.5.10".)

By now, support in the network is widespread and it's time to require
more modern crypto on all Tor instances, whether they're clients or
servers. By doing this early in 0.2.6, we can be sure that at some point
all clients will have reasonable support.

When Tor first generates identity keypair, emit a log message that
thanks for their participation and points to new Tor relay lifecycle
document.

Arma found this and commented on #11243.  Bug not in any released
version of Tor.

Otherwise, we get implicit conversion warning on some platforms.

Conflicts:
	src/tools/tor-resolve.c

This is an "ours" merge so we can leave the version in master alone.

This might make Coverity happier about the if statement where we
have a default case that's the same as one of the other cases. CID 1248515

Bug not in any released tor.  This is CID 1248521

See also http://marc.info/?l=openssl-dev&m=141357408522028&w=2