commit 8dfd916a4b2481258f9f7b0afa13d16104d5339f Merge: 04eacc455 719b5c1d2 Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 8 10:11:57 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug26196 | 4 ++++ src/or/protover.c | 13 +++++++++++++ 2 files changed, 17 insertions(+)