commit 567852fcde278c5be4ec1bea8b2ed8144fd48e62 Merge: ef7df10 907cd8a Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 2 12:10:33 2016 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug20810 | 4 ++++ src/or/protover.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)