commit e5cf65e8ea76cfb821a3dc0ac1b7eebaba41584a Merge: b84815881 53c3174ee Author: Nick Mathewson nickm@torproject.org Date: Sat Nov 18 11:03:16 2017 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

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