[tor-commits] [tor/master] Merge branch 'maint-0.4.2' of git-rw.torproject.org:/tor into maint-0.4.2

[nickm at torproject.org]

commit fbd2fef22014ec5ca553e35147a1b1f0b60cc612
Merge: eebd2d44a f73c8bd78
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 18 12:25:55 2019 -0400

    Merge branch 'maint-0.4.2' of git-rw.torproject.org:/tor into maint-0.4.2

 .travis.yml              | 87 ++++++++++++++++++++----------------------------
 changes/ticket30860      |  3 ++
 changes/ticket31859      |  3 ++
 changes/ticket32063      |  3 ++
 src/feature/hs/hs_cell.c | 13 +++++---
 5 files changed, 55 insertions(+), 54 deletions(-)