Reject proposal 147, and give reasons for doing so.
Make it clearer that authorities scan other votes.

See git commits 2e692bd8 and eaf5487d, which went into 0.2.2.12-alpha:
  o Major bugfixes:
    - Many relays have been falling out of the consensus lately because
      not enough authorities know about their descriptor for them to get
      a majority of votes. When we deprecated the v2 directory protocol,
      we got rid of the only way that v3 authorities can hear from each
      other about other descriptors. Now authorities examine every v3
      vote for new descriptors, and fetch them from that authority. Bugfix
      on 0.2.1.23.

Section 3.6 already says this implicitly when specifying how authorities
download missing router descriptors, but that doesn't mean we can't also
make it more explicit when specifying how authorities exchange votes.
Describe revised TAKEOWNERSHIP shutdown behavior
Typos.
Merge remote-tracking branch 'linus/prop220-nits'

Conflicts:
	proposals/220-ecc-id-keys.txt
Merge remote-tracking branch 'karsten/prop147reject'
Update the index
socks-extensions: we do not in fact ignore usernames
Add proposal 228: cross-certifying identity keys with onion keys
Actually add proposal 228: cross-certifying identity keys with onion keys
Merge remote-tracking branch 'public/bug10449'
Expand an unfinished sentence into a paragraph. Caught by grarpamp.