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

[teor at torproject.org]

commit 2dab7a10780db1047bda4e18c2d308274744e806
Merge: 7741b21d0 283ee0ba0
Author: teor <teor at torproject.org>
Date:   Tue Apr 9 11:36:12 2019 +1000

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

 changes/bug29926       | 2 ++
 doc/asciidoc-helper.sh | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)