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

[asn@xxxxxxxxxxxxxx]

commit 319ce225815897d8626e85037ee203c4de634405
Merge: 438b7eec8 990b434c4
Author: George Kadianakis <desnacked@xxxxxxxxxx>
Date:   Fri Jun 14 13:28:32 2019 +0300

    Merge branch 'bug30806'

 changes/ticket30806             |  3 +++
 src/app/main/main.c             |  4 ----
 src/app/main/shutdown.c         |  2 --
 src/app/main/subsystem_list.c   |  3 +++
 src/lib/evloop/.may_include     |  1 +
 src/lib/evloop/evloop_sys.c     | 49 +++++++++++++++++++++++++++++++++++++++++
 src/lib/evloop/evloop_sys.h     | 17 ++++++++++++++
 src/lib/evloop/include.am       |  2 ++
 src/test/test_channelpadding.c  |  7 ------
 src/test/test_compat_libevent.c |  2 --
 10 files changed, 75 insertions(+), 15 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits