commit acfda9f43d3203bb12913b56cbf8c3891a16253c Merge: ea9f208 4b2a1dc Author: Nicolas Vigier boklm@torproject.org Date: Wed Apr 15 23:56:02 2020 +0200

Merge remote-tracking branch 'sisbell/bug-32993a'

projects/tor-android-service/build | 8 ++++++-- projects/tor-android-service/config | 2 ++ projects/tor/build | 27 ++++++++++++++++++++++----- projects/tor/config | 10 +++++++++- projects/zlib/build | 16 ++++++++++++++-- 5 files changed, 53 insertions(+), 10 deletions(-)