[tor-commits] [tor/master] Merge remote-tracking branch 'meejah/ticket-13941-b'

[nickm at torproject.org]

commit 915c9a517ea27a589c50e2768dda3ec41b2f94b9
Merge: 7c5d888 76753ef
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 12 08:53:14 2014 -0500

    Merge remote-tracking branch 'meejah/ticket-13941-b'

 changes/bug13941     |    4 ++++
 src/or/rendservice.c |    2 +-
 src/or/router.c      |   18 +++++++++++-------
 src/or/router.h      |    2 +-
 4 files changed, 17 insertions(+), 9 deletions(-)