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

[nickm at torproject.org]

commit 85f97941dff26508e703e76a78cd50d1e845b470
Merge: 0d46978 557a0c8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 19 09:40:41 2015 -0500

    Merge branch 'bug13762_quiet_squashed'

 changes/bug13762_quiet |    5 +++++
 src/or/routerlist.c    |   43 ++++++++++++++++++++++++++++++++-----------
 2 files changed, 37 insertions(+), 11 deletions(-)