[tor-commits] [tor/master] Merge remote-tracking branch 'jryans/log-severity'

[nickm at torproject.org]

commit b659ffe9ac371d9a72c148cd45191b1a60dae28d
Merge: 1ad96ed 9b2b799
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 12 09:46:07 2016 -0500

    Merge remote-tracking branch 'jryans/log-severity'

 changes/19965          |  3 +++
 src/common/log.c       |  4 +---
 src/test/test_config.c | 29 ++++++++++++++++++++++++++++-
 3 files changed, 32 insertions(+), 4 deletions(-)