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

[nickm at torproject.org]

commit 25f53955f6d4fd85a7a1a50484a62d18dfa96524
Merge: cb35a7c ff3e08f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 1 13:32:29 2016 -0400

    Merge branch 'maint-0.2.9'

 src/test/test_options.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)