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

commit c750ec20ab3f24fad09695317da55888788e772e Merge: c29f05b15 106b75aa5 Author: George Kadianakis desnacked@riseup.net Date: Thu Sep 5 17:09:20 2019 +0300

Merge branch 'tor-github/pr/1291'

changes/ticket31532 | 4 ++++ src/app/config/confparse.h | 2 +- src/feature/rend/rendclient.c | 2 +- src/lib/buf/buffers.c | 21 +++++++++++---------- src/lib/cc/compat_compiler.h | 2 +- src/lib/conf/conftypes.h | 6 ++++-- src/lib/container/smartlist.c | 10 +++++----- src/lib/container/smartlist.h | 9 +++++---- 8 files changed, 32 insertions(+), 24 deletions(-)