commit 5c68a74ed9d4b880a0abb2e4a695c7932e3255fa
Merge: f9e73a923 5298113da
Author: teor <[email protected]>
Date: Wed Feb 12 12:22:01 2020 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
.travis.yml | 2 --
changes/bug32753 | 3 +++
changes/ticket33075 | 4 ++++
src/app/config/config.c | 2 +-
src/feature/relay/router.c | 15 ++++++++++-----
src/test/test_config.c | 22 +++++++++++++++++++---
6 files changed, 37 insertions(+), 11 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
