[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

[nickm at torproject.org]

commit fe69a7e1d7658d3202af0c2c7308d342faaa1559
Merge: 3781955 7451b4c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 6 09:25:37 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

 changes/bug15600     |    5 +++++
 changes/bug15601     |    4 ++++
 src/or/rendcommon.c  |    2 +-
 src/or/rendservice.c |   10 ++++++++++
 src/or/routerparse.c |   14 +++++++++-----
 5 files changed, 29 insertions(+), 6 deletions(-)