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

[nickm at torproject.org]

commit 5a4caad88d2d5298d7f19c21f0c885c4dfdffe97
Merge: 53a605e fe69a7e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 6 09:31:09 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.5' into release-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(-)