[tor-commits] [tor/master] Merge remote-tracking branch 'jigsaw/fix-22417-without-3-star'

[nickm at torproject.org]

commit 184d889f8ac7a004050a1d3d0c5981d6518410c0
Merge: f9615f9 94d3211
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 30 08:47:14 2017 -0400

    Merge remote-tracking branch 'jigsaw/fix-22417-without-3-star'

 src/common/confline.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)