[tor-commits] [tor/master] Merge branch 'tor-github/pr/611'

[asn at torproject.org]

commit 7fbfdf2af731f500e3df3ca8207e6822f87f1bc9
Merge: 626e6d2c3 f632335fe
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Feb 26 12:33:23 2019 +0200

    Merge branch 'tor-github/pr/611'

 changes/ticket28913           |  4 ++++
 src/feature/control/control.c |  3 ++-
 src/feature/hs/hs_client.c    |  5 ++++-
 src/feature/hs/hs_common.c    |  3 ++-
 src/feature/hs/hs_service.c   |  3 ++-
 src/feature/rend/rendcache.c  |  8 ++++----
 src/feature/rend/rendcommon.c |  5 +++--
 src/feature/rend/rendparse.c  | 17 +++++++++++------
 src/lib/encoding/binascii.c   |  4 ++--
 src/test/fuzz/fuzz_strops.c   |  8 +-------
 src/test/test_crypto.c        |  8 ++++----
 src/test/test_util_format.c   |  4 ++--
 12 files changed, 41 insertions(+), 31 deletions(-)