[tor-commits] [torspec/master] Merge remote-tracking branch 'teor/bug23826-23828-v2'

[nickm at torproject.org]

commit 48e41c559f5b5438838d15c4fd9a1b46c7296310
Merge: 0596c2c b523c5c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 4 11:48:43 2017 -0500

    Merge remote-tracking branch 'teor/bug23826-23828-v2'

 dir-spec.txt                              |  38 ++++++----
 proposals/283-ipv6-in-micro-consensus.txt | 111 ++++++++++++++++++------------
 2 files changed, 94 insertions(+), 55 deletions(-)