commit 10e40ca1de34d0e0611d510f913ff4f181e04c10 Merge: 3f8201f229 d0b83c7423 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 22 16:54:35 2020 -0400

Merge branch 'ticket40136'

doc/state-contents.txt | 225 +++++++++++++++++++++++++++++++++++++++---------- doc/ticket40136 | 3 + 2 files changed, 184 insertions(+), 44 deletions(-)