Fixes other case of #9578

We had updated our "do we have enough microdescs to begin building
circuits?" logic most recently in 0.2.4.10-alpha (see bug 5956), but we
left the bootstrap status event logic at "how far through getting 1/4
of them are we?"

Fixes bug 9958; bugfix on 0.2.2.36, which is where they diverged (see
bug 5343).

Fix format_helper_exit_status to allow full HEX_ERRNO_SIZE answers,
*and* increase the buffer length again.

Bugfix on 12938354, which implemented
6752: Not in any released tor.

Use "ours" strategy to avoid taking 73a0bb16
from 0.2.4.  We _do_ want to keep torrc.sample.in changes in 0.2.5.

This reverts the torrc.sample.in changes from commit
66a04a6a.

We're going to not make this change in 0.2.4, since changing
torrc.sample.in makes all the debian users do some pointless
busywork. see tor-dev discusion of 9 Oct 2013.

Karsten Loesing authored 11 years ago and Nick Mathewson committed 11 years ago

Explicitly include bridges, and note that we archive and publish all
descriptors.

(We are not yet publishing ContactInfo lines contained in bridge
descriptors, but maybe we'll want to do that soon, so let's err on the
side of caution here.)

Related to #9854.

Patch from "hantwister" on trac. Fixes bug #9904; bugfix on
0.2.3.11-alpha.

Using "ours" strategy since we already merged the equivalent of #9866
into this branch.

Conflicts:
	src/or/relay.c