[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

[nickm at torproject.org]

commit ab013719e5f00e44c45d2bbc3bc54c8833321d82
Merge: 1d45438 e7ade23
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 7 11:26:02 2016 -0500

    Merge branch 'maint-0.2.9'

 src/test/test_options.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)