[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1186'

[nickm@xxxxxxxxxxxxxx]

commit f6db290e5a7268ebe9dc504af53d50294766ac22
Merge: ef2dd1ba9 fdfee3d06
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Jul 23 12:30:19 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1186'

 changes/bug31113                         |  3 +++
 scripts/maint/practracker/exceptions.txt |  1 +
 src/core/or/circuitpadding.c             | 40 +++++++++++++++++++-------------
 src/core/or/circuitpadding.h             | 21 +++++++++--------
 4 files changed, 39 insertions(+), 26 deletions(-)

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