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

[nickm at torproject.org]

commit 8e1e71cc0d024d52f6368cb012e66da58683ff25
Merge: 74e41155f 6243133a7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 22 14:31:01 2019 -0500

    Merge branch 'bug29122'

 changes/bug29122               | 3 +++
 src/test/test_circuitpadding.c | 4 ++++
 2 files changed, 7 insertions(+)