[tor-commits] [tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1230' into maint-0.4.1

[nickm at torproject.org]

commit 6a89b0104970037893536f3336a1ec982da13dc6
Merge: bba64c988 6deba34fe
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 19 11:11:32 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1230' into maint-0.4.1

 changes/bug31356_and_logs                | 11 +++++
 scripts/maint/practracker/exceptions.txt |  3 ++
 src/core/or/circuitpadding.c             | 81 +++++++++++++++++++++++---------
 src/core/or/or.h                         |  4 +-
 src/core/or/protover.c                   |  2 +-
 src/core/or/protover.h                   |  2 +
 src/core/or/versions.c                   |  5 +-
 src/rust/protover/protover.rs            |  4 +-
 src/test/test_circuitpadding.c           |  4 +-
 9 files changed, 84 insertions(+), 32 deletions(-)