[tor-commits] [tor/master] Merge branch 'combined_libs'

[nickm at torproject.org]

commit 2908086694ee3822c8d3116952bec5a415387d75
Merge: 0d420918e7 e834702f9d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 23 10:33:07 2020 -0400

    Merge branch 'combined_libs'

 Makefile.am                           | 21 +++++++++++++++++++--
 changes/ticket40127                   |  7 +++++++
 scripts/build/combine_libs            | 35 +++++++++++++++++++++++++++++++++++
 scripts/codegen/fuzzing_include_am.py |  7 ++++---
 src/app/include.am                    |  4 ++--
 src/test/fuzz/include.am              |  7 ++++---
 src/test/include.am                   | 10 +++++-----
 7 files changed, 76 insertions(+), 15 deletions(-)