Merge branch 'better_workqueue_v3_squashed'

diff --cc configure.ac
Simple merge

diff --cc src/or/config.c
Simple merge

diff --cc src/or/connection.c
Simple merge

diff --cc src/or/or.h
Simple merge

diff --cc src/test/include.am
Simple merge

diff --cc src/test/test.c
Simple merge

diff --cc src/test/test_util.c
Simple merge