commit dec7dc3d823a8a9cc1d9d75d1b803a6e6b308a8e Merge: 7e469c1 3f005c0 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 14 19:15:10 2017 -0500

Merge remote-tracking branch 'dgoulet/ticket20656_030_01'

changes/ticket20656 | 3 +++ src/or/protover.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)