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

[nickm at torproject.org]

commit f57fd0318a0c02ed1e8a4f3ff65e9d1e328fe811
Merge: 2ac24b503 8b5ad246e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 2 10:01:26 2018 -0400

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

 changes/ticket28006                | 3 +++
 scripts/test/chutney-git-bisect.sh | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)