[tor-commits] [tor/master] Merge remote-tracking branch 'teor/nickm-bug13401'

[nickm at torproject.org]

commit 180ecd6a2b3ee9fe10fed760d30ac9fb72b03346
Merge: 7b51667 ac2f90e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Jan 11 11:10:23 2015 -0500

    Merge remote-tracking branch 'teor/nickm-bug13401'

 changes/bug13401                         |    7 +++++++
 changes/bug14067-TestingDirAuthVoteHSDir |    6 ++++++
 doc/tor.1.txt                            |    9 +++++++++
 src/or/config.c                          |   12 +++++++++---
 src/or/dirserv.c                         |   15 +++++++++++----
 src/or/or.h                              |    5 +++++
 src/or/rendservice.c                     |   18 ++++++++++++------
 src/test/test-network.sh                 |    2 +-
 8 files changed, 60 insertions(+), 14 deletions(-)