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

[nickm at torproject.org]

commit d029a5162d0f2a3255630500f9c81cc4f7bdc103
Merge: 34083f00a fb137b30f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 16 08:32:06 2018 -0400

    Merge branch 'ticket27096'

 changes/bug27096        |  3 +++
 src/test/test_options.c | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+)