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

[nickm at torproject.org]

commit 62f98ad485ac4e05b7680de0b2ed3c5e416c083d
Merge: 1fbff41 cb6b3b7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 15 07:58:15 2017 -0500

    Merge branch 'maint-0.2.9'

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