commit 73eaa66b3571564c9805087cdde54a292f09ea56 Merge: 2b650b6 72023fc Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 2 12:11:58 2016 -0500

Merge remote-tracking branch 'dgoulet/ticket20803_01'

dir-spec.txt | 82 +++++++++++++++++ proposals/000-index.txt | 4 +- proposals/264-subprotocol-versions.txt | 2 +- tor-spec.txt | 155 +++++++++++++++++++++++++++++++++ 4 files changed, 240 insertions(+), 3 deletions(-)