commit d4d541c53c209370ae33f5f6caad2ec13743a4ba Merge: 9d0ce0afc 065b74fa3 Author: teor teor@torproject.org Date: Mon Mar 25 14:01:20 2019 +1000

Merge remote-tracking branch 'tor-github/pr/785'

changes/ticket29756 | 3 +++ scripts/maint/checkSpace.pl | 32 ++++++++++++++++++++++++++++++ src/feature/control/btrack_orconn_cevent.h | 1 + src/feature/control/btrack_orconn_maps.h | 1 + src/feature/hs/hs_stats.h | 4 ++++ src/lib/log/log.h | 2 +- src/test/test_connection.h | 4 ++++ src/test/test_dir_common.h | 4 ++++ 8 files changed, 50 insertions(+), 1 deletion(-)