Merge branch 'bug9922'
Give credit to bug reporter for 9928
Merge remote-tracking branch 'public/bug9596' into maint-0.2.4
Merge remote-tracking branch 'origin/maint-0.2.4'
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Merge remote-tracking branch 'origin/maint-0.2.4'
Tweak a comment
Merge remote-tracking branch 'public/bug9927' into maint-0.2.4
Merge remote-tracking branch 'origin/maint-0.2.4'

Conflicts:
	src/or/relay.c
Anchors for options (re#9866)
Changes file for 9866
Merge remote-tracking branch 'origin/maint-0.2.4'

Using "ours" strategy since we already merged the equivalent of #9866
into this branch.
Switch ECDHE group default logic for bridge/relay TLS

According to the manpage, bridges use P256 for conformity and relays
use P224 for speed. But skruffy points out that we've gotten it
backwards in the code.

In this patch, we make the default P256 for everybody.

Fixes bug 9780; bugfix on 0.2.4.8-alpha.
When examining interfaces to find an address, discard non-up ones.

Patch from "hantwister" on trac. Fixes bug #9904; bugfix on
0.2.3.11-alpha.
Merge remote-tracking branch 'origin/maint-0.2.4'
Clarify who learns about ContactInfo.

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.
Changes file for 9854
Merge remote-tracking branch 'origin/maint-0.2.4'
Update last modified timestamp of torrc.sample.in.
Partially revert "Clarify who learns about ContactInfo."

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

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.