[tor-commits] [torspec/master] Merge remote-tracking branch 'tor-github/pr/102'

[teor at torproject.org]

commit ff165e0f449d09ee3c872016e5abc35cf75e918c
Merge: 36b3b2c e27cbca
Author: teor <teor at torproject.org>
Date:   Wed Jan 15 22:50:10 2020 +1000

    Merge remote-tracking branch 'tor-github/pr/102'

 proposals/306-ipv6-happy-eyeballs.txt | 340 +++++++++++++++++++---------------
 1 file changed, 193 insertions(+), 147 deletions(-)