commit 831d3b794da65b03be7e4fd107ba209d7211de76 Merge: 6f8c32b7d 9f2efd02a Author: Nick Mathewson nickm@torproject.org Date: Sat Nov 18 11:00:45 2017 -0500

Merge branch 'ticket18329_minimal_025' into maint-0.2.5

changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+)