commit 53ece8bd23f9f0d90c04d235c269cfdc3ecfb1e6 Merge: 530347972 af26cd610 Author: David Goulet dgoulet@torproject.org Date: Thu Jul 25 10:27:41 2019 -0400

Merge branch 'maint-0.4.1' into release-0.4.1

changes/bug31024 | 4 ++++ changes/bug31027 | 3 +++ src/core/or/circuitpadding.c | 15 ++++++++++----- 3 files changed, 17 insertions(+), 5 deletions(-)