[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0

[nickm at torproject.org]

commit 463ded569c13f633b12d74ad0048b0b367a511b4
Merge: 121d271dc 6a6f7eb67
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 5 16:24:10 2019 -0400

    Merge branch 'maint-0.4.0' into release-0.4.0

 .travis.yml                            | 23 ++----------------
 changes/bug30189                       |  4 ++++
 changes/bug30316                       |  4 ++++
 changes/bug30452                       |  3 +++
 changes/ticket30213                    |  3 +++
 changes/ticket30234                    |  2 ++
 changes/ticket30454                    | 10 ++++++++
 doc/tor.1.txt                          | 17 ++++++++-----
 src/app/config/config.c                | 13 ++++++++++
 src/app/main/main.c                    |  1 +
 src/config/torrc.sample.in             | 21 ++++++++++++----
 src/feature/dirauth/authmode.h         |  4 ++++
 src/feature/dirauth/dirvote.c          | 11 ++++-----
 src/feature/hs/hs_cell.c               | 16 +++++++------
 src/feature/hs/hs_cell.h               | 13 ----------
 src/feature/hs/hs_client.c             | 18 +++++++-------
 src/feature/hs/hs_intropoint.c         | 27 +++++++++++----------
 src/feature/hs/hs_intropoint.h         | 15 ------------
 src/lib/log/util_bug.c                 | 14 +++++++++++
 src/lib/log/util_bug.h                 |  8 ++++---
 src/test/test_hs_cell.c                |  2 +-
 src/test/test_hs_intropoint.c          |  4 ++--
 src/trunnel/hs/cell_introduce1.c       | 44 +++++++++++++---------------------
 src/trunnel/hs/cell_introduce1.h       |  7 ++++++
 src/trunnel/hs/cell_introduce1.trunnel | 21 +++++++++++++---
 25 files changed, 174 insertions(+), 131 deletions(-)