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

[nickm at torproject.org]

commit d671e3f513cb62ca2e649d3c162d0874436eacf2
Merge: 3d8fcbcba 4af27e016
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 2 13:09:45 2018 -0400

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

 changes/ticket28010            | 3 +++
 scripts/codegen/run_trunnel.sh | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)