[tor-commits] [tor/master] Merge remote-tracking branch 'twstrike/options_test'

[nickm at torproject.org]

commit 00b13cb09170e5144516698429c29975abe2de10
Merge: d748c19 1722232
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 15 10:52:27 2016 -0500

    Merge remote-tracking branch 'twstrike/options_test'

 src/common/compat.c         |    3 +-
 src/common/compat.h         |    3 +-
 src/common/log.c            |    1 -
 src/common/torlog.h         |    1 -
 src/test/log_test_helpers.c |    1 -
 src/test/log_test_helpers.h |    1 -
 src/test/test_options.c     | 4026 ++++++++++++++++++++++++++++++++++++++++++-
 7 files changed, 4023 insertions(+), 13 deletions(-)