[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

[nickm at torproject.org]

commit 8a5c66cbb0adf1ef63f1c5f1048dfbc4c6f7267d
Merge: 485803dff 26873bc4e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 19 11:27:21 2019 -0500

    Merge branch 'maint-0.4.0'

 changes/bug28698         |  3 +++
 src/core/or/circuituse.c | 30 ++++++++++++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)