Disable middle relay queue overfill detection code due to possible guard discovery attack
Merge branch 'bug9072-023' into bug9072-024
Limit hidden service descriptors to at most 10 guard nodes.

Fixes bug 9002; bugfix on 0.1.1.11-alpha (which introduced guard
nodes), or on 0.0.6pre1 (which introduced hidden services).
Implement a real OOM-killer for too-long circuit queues.

This implements "algorithm 1" from my discussion of bug #9072: on OOM,
find the circuits with the longest queues, and kill them.  It's also a
fix for #9063 -- without the side-effects of bug #9072.

The memory bounds aren't perfect here, and you need to be sure to
allow some slack for the rest of Tor's usage.

This isn't a perfect fix; the rest of the solutions I describe on
codeable.
Merge branch 'bug9063_redux_023_squashed' into maint-0.2.3
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

Conflicts:
	src/or/config.c
	src/or/relay.c
Tweak bug9063_redux patch: {n_p}_chan_cells, not {n,p}_conn_cells
Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4