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

[nickm at torproject.org]

commit ca4a0ae0b18c2f3f14eb7a6243b52f5769216aa0
Merge: ed4213f 907cd8a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 2 12:10:39 2016 -0500

    Merge branch 'maint-0.2.9'

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