commit 2e89f93aee97016c17377a84ac46ea50f286acc8 Merge: 87698dc a4c0cd1 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Sep 6 08:00:09 2019 -0400 Merge branch 'prop306_squashed' proposals/306-ipv6-happy-eyeballs.txt | 300 ++++++++++++++++++++++++++++++++++ 1 file changed, 300 insertions(+)