[tor-commits] [tor/master] Merge remote-tracking branch 'rl1987/bug9812'

[nickm at torproject.org]

commit 99e2a325f67c4c4ca904c76fe5345e35befabb9d
Merge: a87c697 e395783
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 12 10:27:12 2014 -0500

    Merge remote-tracking branch 'rl1987/bug9812'

 changes/bug9812     |    6 ++++++
 src/common/crypto.c |    2 +-
 src/or/routerlist.c |    8 +++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)