commit 1e48c776910219974193ac0d121067d65bfb9959 Merge: f44a8ce 739702d Author: Nick Mathewson nickm@torproject.org Date: Mon May 15 18:18:52 2017 -0400

Merge branch 'prop140_completed_squashed'

dir-spec.txt | 110 +++++++++++++++++++++++++++++++++++++- proposals/000-index.txt | 4 +- proposals/140-consensus-diffs.txt | 3 +- tor-spec.txt | 2 + 4 files changed, 115 insertions(+), 4 deletions(-)