[tor-commits] [tor/master] Merge remote-tracking branch 'andrea/ticket18640_v3'

commit 1dfa2213a424c36d4aa70fdab60b27b6b5e1ced2 Merge: 20136a8 9a09513 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Aug 25 14:29:06 2016 -0400 Merge remote-tracking branch 'andrea/ticket18640_v3' src/or/config.c | 30 ++++ src/or/connection.c | 304 ++++++++++++++++++++++++++++++++- src/or/connection.h | 23 ++- src/or/connection_or.c | 4 +- src/or/connection_or.h | 2 +- src/or/main.c | 21 ++- src/or/main.h | 4 +- src/or/or.h | 7 + src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_oos.c | 454 +++++++++++++++++++++++++++++++++++++++++++++++++ 12 files changed, 840 insertions(+), 12 deletions(-)