commit 669d79d2d66ec8346fc590038367b87f72697d9f Merge: 9ead4e9 9fe6ffa Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 8 07:49:44 2016 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug19960 | 4 ++++ src/or/config.c | 2 +- src/test/test_options.c | 18 ++++++++++++------ 3 files changed, 17 insertions(+), 7 deletions(-)