[tor-commits] [tor/master] Merge remote-tracking branch 'weasel/bug19503'

[nickm at torproject.org]

commit 7602b0b31f8ba0d080f84bcb700db0100efcb26f
Merge: 79b2ba8 54c3066
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 29 16:10:10 2016 -0400

    Merge remote-tracking branch 'weasel/bug19503'

 changes/bug19503    | 3 +++
 src/or/routerkeys.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)