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

[nickm at torproject.org]

commit b6164e1604be7f6692156d2103f2de0fba4ca8b5
Merge: f82f0c3 b7a1e79
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 10 09:25:11 2016 -0500

    Merge remote-tracking branch 'public/feature20552'

 changes/feature20552 | 4 ++++
 src/or/or.h          | 4 ++++
 src/or/protover.c    | 2 +-
 src/or/routerparse.c | 2 ++
 4 files changed, 11 insertions(+), 1 deletion(-)