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

[nickm at torproject.org]

commit 485803dffe8bfc7852c26144a113716fc84cd998
Merge: 9a158a45b 5c87add92
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 19 11:21:54 2019 -0500

    Merge branch 'maint-0.4.0'

 changes/bug29298               | 5 +++++
 src/test/test_circuitpadding.c | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)