commit ba8d71d9c37dcce213a0386e96731de5ba7d80fa Merge: 8e5c75e89 29542ccdc Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 5 09:10:24 2020 -0500
Merge remote-tracking branch 'tor-github/pr/1774/head'
changes/bug33531 | 3 +++ src/core/or/circuituse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)