[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

[nickm at torproject.org]

commit 4e15c2cb7d905bd981aaae45aa2f186424b33040
Merge: 0b787b1 f6a3d21
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Nov 6 20:32:21 2016 -0500

    Merge branch 'maint-0.2.9'

 src/or/protover.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)