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

we were listing 50% as soon as we got a bridge's relay descriptor,
even if we didn't have any consensus, certificates, etc yet.

The old code had logic to use a shorter path length if we didn't
have enough nodes. But we don't support 2-node networks anwyay.

Fix for #9926.  I'm not calling this a bugfix on any particular
version, since a 2-node network would fail to work for you for a lot
of other reasons too, and it's not clear to me when that began, or if
2-node networks would ever have worked.

Fix for 9927.

By calling circuit_n_chan_done() unconditionally on close, we were
closing pending connections that might not have been pending quite for
the connection we were closing.  Fix for bug 9880.

Thanks to skruffy for finding this and explaining it patiently until
we understood.

Now that we no longer build it from torify.in, we need to list it
manually.