commit 52d7af631cb1075289ba519d0c3b89e0b5816f5e Merge: 072e194a1 2c0487ecf Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 30 12:07:26 2017 -0500

Merge branch 'trove-2017-010_029' into maint-0.2.9

changes/trove-2017-010 | 6 ++++++ src/or/protover.c | 5 +++++ 2 files changed, 11 insertions(+)