commit 811ed8cf9f58d8480244483f4ad012ea9dca42ef Merge: 5823e62fa ffdfd39d4 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 30 08:24:14 2018 -0400

Merge remote-tracking branch 'rl1987/bug26892_take2'

changes/bug26892 | 6 ++++++ src/feature/relay/router.c | 3 +++ 2 files changed, 9 insertions(+)