[tor-commits] [tor/master] Merge remote-tracking branch 'public/feature21496'

[nickm at torproject.org]

commit a783c5cbaedc88842f76584b96c89a765713f78a
Merge: 31c9bda 5203cd2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 15 10:59:30 2017 -0400

    Merge remote-tracking branch 'public/feature21496'

 changes/bug21496     | 4 ++++
 src/or/routerparse.c | 3 +++
 2 files changed, 7 insertions(+)