commit da8505205dab91f36a5d3f67ca9b4e0904d44b0a Merge: 44b48a9 7451b4c Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 6 09:31:30 2015 -0400

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

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