[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1168'

[teor at torproject.org]

commit 3539fdfd7a0ad965f3e247116a6012d1b5d2a167
Merge: a1f73cb93 c2521873a
Author: teor <teor at torproject.org>
Date:   Mon Oct 21 13:09:48 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1168'

 src/core/or/circuitpadding.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)