[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/29'

[nickm@xxxxxxxxxxxxxx]

commit 6fb1637255122dc3660486cf731c0f4640fd98db
Merge: 1a4e475d5 dfaa0a82a
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Jul 10 12:53:46 2020 -0400

    Merge remote-tracking branch 'tor-gitlab/mr/29'

 changes/ticket32910                      |   5 +
 configure.ac                             |  84 +++++++-
 doc/HACKING/Tracing.md                   | 150 +++++++++-----
 scripts/maint/practracker/exceptions.txt |   2 +
 src/app/include.am                       |   4 +-
 src/app/main/main.c                      |   4 +
 src/app/main/subsystem_list.c            |   3 +
 src/core/or/circuitbuild.c               |   6 +
 src/core/or/circuitlist.c                |  10 +
 src/core/or/circuituse.c                 |  15 +-
 src/core/or/include.am                   |   7 +
 src/core/or/lttng_circuit.inc            | 322 +++++++++++++++++++++++++++++++
 src/core/or/trace_probes_circuit.c       |  30 +++
 src/core/or/trace_probes_circuit.h       |  22 +++
 src/lib/trace/.may_include               |   1 +
 src/lib/trace/debug.h                    |  30 +--
 src/lib/trace/events.h                   |  84 +++++---
 src/lib/trace/include.am                 |  26 ++-
 src/lib/trace/lttng/include.am           |   3 +
 src/lib/trace/lttng/lttng.h              |  28 +++
 src/lib/trace/trace.c                    |   8 +-
 src/lib/trace/trace.h                    |  30 ++-
 src/lib/trace/trace_stub.c               |  19 ++
 src/lib/trace/trace_sys.c                |  36 ++++
 src/lib/trace/trace_sys.h                |  22 +++
 src/lib/trace/usdt/include.am            |   3 +
 src/lib/trace/usdt/usdt.h                |  33 ++++
 src/test/fuzz/include.am                 |   2 +-
 src/test/include.am                      |  18 +-
 29 files changed, 895 insertions(+), 112 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits