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

[nickm at torproject.org]

commit 96cf608b2eeb4643290917b093ae9bd1c1364700
Merge: 40c7871f4 7f3292064
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 3 09:33:40 2017 -0400

    Merge branch 'bug22885_squashed'

 changes/bug22885 | 5 +++++
 src/or/router.c  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)