commit ad1ffb6b2fc77c6d98823c124d781bb55f4f9637 Merge: e4429d234 a5dd41b9a Author: David Goulet dgoulet@torproject.org Date: Tue Feb 26 11:25:15 2019 -0500

Merge branch 'maint-0.4.0' into release-0.4.0

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