[tor-commits] [tor/master] Merge branch 'bug22466_diagnostic_030'

[nickm at torproject.org]

commit 26d9fffae428a186e92ffa53053da76bea519fec
Merge: be741d7 f2068ef
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 09:52:09 2017 -0400

    Merge branch 'bug22466_diagnostic_030'

 changes/bug22466_diagnostic | 4 ++++
 src/or/routerkeys.c         | 4 ++++
 src/or/torcert.c            | 4 ++++
 3 files changed, 12 insertions(+)