commit 2a44ee9b8c75cd8bad01a3b5142a1897edb6f824 Merge: 3ac8cdb8c a5dd41b9a Author: David Goulet dgoulet@torproject.org Date: Tue Feb 26 11:25:16 2019 -0500

Merge branch 'maint-0.4.0'

changes/bug29017 | 4 ++++ doc/tor.1.txt | 2 +- src/feature/relay/router.c | 11 +++++------ 3 files changed, 10 insertions(+), 7 deletions(-)