commit 2692b1c94ca5e2898eef8eefa2fc06545d80fe3d Merge: 2896446 0bfbfad Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 12 12:48:22 2020 -0400

Merge branch 'master' of git-rw.torproject.org:/torspec

control-spec.txt | 10 +++++----- proposals/313-relay-ipv6-stats.txt | 11 +---------- rend-spec-v3.txt | 31 ++++++++++++++++++------------- 3 files changed, 24 insertions(+), 28 deletions(-)