[tor-commits] [tor/main] Merge remote-tracking branch 'tor-gitlab/mr/491' into main

[ahf at torproject.org]

commit 48d778bc3246cd7e459475f1045ad24684ddeb85
Merge: 95b82c4fee dd085d42f9
Author: Alexander Færøy <ahf at torproject.org>
Date:   Wed Dec 15 12:41:00 2021 +0000

    Merge remote-tracking branch 'tor-gitlab/mr/491' into main

 changes/bug40515                  |  6 ++++++
 src/core/or/origin_circuit_st.h   |  6 ++++++
 src/feature/client/circpathbias.c | 11 +++++++++++
 src/feature/control/control_cmd.c |  2 ++
 4 files changed, 25 insertions(+)