[tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4

[nickm at torproject.org]

commit 040d7cecf39c06ee705a97c90d546d34d6c115ab
Merge: d7810bb 51675f9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 08:40:00 2017 -0500

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/bug15823     |  4 ++++
 changes/bug17404     |  6 ++++++
 changes/bug18089     |  6 ++++++
 src/common/crypto.c  | 10 ++++++++++
 src/common/tortls.c  |  4 ++++
 src/or/rendservice.c | 18 ++++++++++++++----
 6 files changed, 44 insertions(+), 4 deletions(-)