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

commit 4b4b3afb569a40db99c1614bc83d835b0a23fe27 Merge: 5b8956df3 b88d00fea Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 28 10:23:05 2017 -0400

Merge branch 'bug22802_squashed'

changes/bug22802 | 10 ++++++++++ src/common/procmon.c | 2 +- src/common/util.c | 8 -------- src/or/circuitstats.c | 4 ++-- src/or/dirserv.c | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-)