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

[nickm at torproject.org]

commit 164c8349fb445ecb3dded9547bd61cfbaeaf6ee8
Merge: b3f24b5 0475552
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 6 09:30:54 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6

 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(-)