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

[asn at torproject.org]

commit 4673cb8168cbacd817c38c3f1ca5c9e88d10b053
Merge: ffd857bbe fc1134e3e
Author: George Kadianakis <desnacked at riseup.net>
Date:   Mon Sep 30 13:44:59 2019 +0300

    Merge branch 'tor-github/pr/1339'

 Makefile.am                                |   2 +-
 changes/ticket31759                        |   5 +
 scripts/maint/annotate_ifdef_directives    |  74 -------
 scripts/maint/annotate_ifdef_directives.py | 317 +++++++++++++++++++++++++++++
 src/app/config/config.c                    |   6 +-
 src/lib/crypt_ops/compat_openssl.h         |   2 +-
 src/lib/fs/dir.c                           |   2 +-
 src/lib/log/util_bug.h                     |   2 +-
 src/lib/math/fp.c                          |   2 +-
 src/lib/memarea/memarea.c                  |   2 +-
 src/lib/process/daemon.c                   |   2 +-
 src/lib/process/process.c                  |   2 +-
 src/lib/process/restrict.c                 |   2 +-
 src/lib/process/setuid.c                   |   2 +-
 src/lib/tls/tortls_openssl.c               |   4 +-
 15 files changed, 337 insertions(+), 89 deletions(-)