commit 8fe410e875343a4c134ddbe0db6da3d38865deee Merge: a601ed5 33a3e6f Author: Nick Mathewson <nickm@torproject.org> Date: Fri Aug 26 09:46:40 2016 -0400 Merge remote-tracking branch 'andrea/oos-test-failures' src/or/connection.c | 4 ++-- src/test/test_oos.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)