[tor-commits] [tor/master] Merge branch 'bug14451_026_v1'

[nickm at torproject.org]

commit a87ea9b1c6a61acebc670f54a62e8c443329c34c
Merge: f6afb04 4c5133e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 29 15:16:15 2015 -0500

    Merge branch 'bug14451_026_v1'

 changes/bug12585     |    7 +++-
 changes/bug14451     |    7 ++++
 doc/tor.1.txt        |    8 +---
 src/or/config.c      |  108 ++++++++++++++++++++++++++++++++++++--------------
 src/or/config.h      |    1 +
 src/or/connection.c  |   29 +++++++++-----
 src/or/connection.h  |    1 +
 src/or/or.h          |    4 --
 src/or/rendservice.c |   25 +++++-------
 9 files changed, 123 insertions(+), 67 deletions(-)