[tor-commits] [tor/master] Merge branch 'bug28683_30173_29203_squashed'

[nickm at torproject.org]

commit 9ad2eb8f73b70292e36511424d676b223d4cdff0
Merge: c6523a639 507df74b3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 13 14:33:31 2019 -0400

    Merge branch 'bug28683_30173_29203_squashed'

 changes/bugs28693+30173+29203            |  12 +++
 doc/tor.1.txt                            |  14 +++
 scripts/maint/practracker/exceptions.txt |   6 +-
 src/app/config/config.c                  |  10 ++
 src/app/config/or_options_st.h           |  11 +++
 src/core/or/circuitpadding.c             |  59 +++++++++++-
 src/core/or/circuitpadding.h             |  11 +++
 src/test/test_circuitpadding.c           | 157 ++++++++++++++++++++++++++++++-
 src/test/test_options.c                  |   1 +
 9 files changed, 274 insertions(+), 7 deletions(-)

diff --cc scripts/maint/practracker/exceptions.txt
index 7ed90482c,d51e3edb5..ee4f421bd
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@@ -29,12 -29,12 +29,12 @@@
  #
  # Remember: It is better to fix the problem than to add a new exception!
  
- problem file-size /src/app/config/config.c 8494
- problem include-count /src/app/config/config.c 87
 -problem file-size /src/app/config/config.c 8501
 -problem include-count /src/app/config/config.c 86
++problem file-size /src/app/config/config.c 8510
++problem include-count /src/app/config/config.c 88
  problem function-size /src/app/config/config.c:options_act_reversible() 296
  problem function-size /src/app/config/config.c:options_act() 588
  problem function-size /src/app/config/config.c:resolve_my_address() 192
- problem function-size /src/app/config/config.c:options_validate() 1209
 -problem function-size /src/app/config/config.c:options_validate() 1215
++problem function-size /src/app/config/config.c:options_validate() 1220
  problem function-size /src/app/config/config.c:options_init_from_torrc() 202
  problem function-size /src/app/config/config.c:options_init_from_string() 173
  problem function-size /src/app/config/config.c:options_init_logs() 146