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

commit 0e354ad45966d29ff4cd75854dbd1715270a2168 Merge: 525307c a86ed1d Author: Nick Mathewson <nickm@torproject.org> Date: Thu Apr 14 16:25:21 2016 -0400 Merge branch 'assert_nonfatal_squashed' changes/assert_nonfatal | 5 ++ src/common/include.am | 2 + src/common/util.c | 17 ------ src/common/util.h | 41 +------------ src/common/util_bug.c | 53 +++++++++++++++++ src/common/util_bug.h | 150 ++++++++++++++++++++++++++++++++++++++++++++++++ src/or/connection.c | 6 +- src/or/main.c | 8 +-- src/or/policies.c | 2 +- src/or/rephist.c | 4 +- 10 files changed, 219 insertions(+), 69 deletions(-)