commit 86b9d2f1519155024b8402f521b1a7e649b4dfa5 Merge: c3162df 232a381 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Sep 14 10:20:46 2016 -0400 Merge branch 'dgoulet_ticket19958_01' proposals/264-subprotocol-versions.txt | 51 +++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 20 deletions(-)