[tor-commits] [torspec/master] Merge branch 'prop312-squashed'

[teor at torproject.org]

commit ad1b25cb54d800c77cefcdb39e398f46da80fba3
Merge: 5e79a7d c09bbe9
Author: teor <teor at torproject.org>
Date:   Wed Feb 5 22:07:06 2020 +1000

    Merge branch 'prop312-squashed'

 proposals/312-relay-auto-ipv6-addr.txt | 1542 ++++++++++++++++++++++++++++++++
 1 file changed, 1542 insertions(+)