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

[nickm at torproject.org]

commit e7e33d4b04be508e327f79786e1e0a885afd7a6d
Merge: 9ddc1fb 18a1574
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 20 14:07:37 2015 -0500

    Merge branch 'bug14084'

 changes/bug14084         |    6 ++++++
 doc/tor.1.txt            |    6 ++++++
 src/or/config.c          |    1 +
 src/or/connection_edge.c |    9 +++++++--
 src/or/rendservice.c     |   26 +++++++++++++++++++++++---
 5 files changed, 43 insertions(+), 5 deletions(-)