commit 63af434a6951c7a6738f282378eb06172e27f37f Merge: a9fee22 b418155 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 18 14:12:40 2020 -0400

Merge branch 'ticket33639'

control-spec.txt | 3 +++ tor-spec.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)