[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket21893_031_01'

[nickm at torproject.org]

commit 506b4bfabaf823225c34172fae6dd405cfe1b58e
Merge: d33c362 dff5000
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Apr 7 11:04:06 2017 -0400

    Merge remote-tracking branch 'dgoulet/ticket21893_031_01'

 src/or/or.h          | 10 ++++++++++
 src/or/routerparse.c |  4 ++++
 2 files changed, 14 insertions(+)