commit 39b54bf1dd7975a4a087a8f57e79c2a2202fe755 Merge: 10d8555e7d 9c653e58b4 Author: Alexander Færøy ahf@torproject.org Date: Thu Jul 16 14:19:18 2020 +0000

Merge branch 'tor-gitlab/merge-requests/53'

changes/ticket40036 | 3 + doc/HACKING/tracing/EventsCircuit.md | 139 ++++++++++++++++++++++++++ doc/HACKING/{Tracing.md => tracing/README.md} | 0 3 files changed, 142 insertions(+)