[tor-commits] [tor/master] Merge remote-tracking branch 'weasel/bug18458'

[nickm at torproject.org]

commit c9899ee64008b63cb9867115ac684590dd50f902
Merge: 4b02af4 d8626d3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 15 09:18:24 2016 -0400

    Merge remote-tracking branch 'weasel/bug18458'

 changes/bug18458       |  9 +++++++++
 doc/tor.1.txt          |  3 +++
 src/common/util.c      |  8 ++++++--
 src/common/util.h      | 13 +++++++------
 src/or/config.c        | 16 ++++++++++++----
 src/or/connection.c    |  4 ++++
 src/or/or.h            |  1 +
 src/test/test_config.c |  7 +++++++
 8 files changed, 49 insertions(+), 12 deletions(-)