commit f684b48b5be5515395846d089a386167e76f895a
Merge: 61d5ce83a 0abf09b2c
Author: Nick Mathewson <ni...@torproject.org>
Date: Wed May 9 14:01:08 2018 -0400
Merge branch 'ticket26009'
changes/ticket26009 | 9 +++
src/or/circuitbuild.c | 30 ++++++----
src/or/circuitbuild.h | 2 +-
src/or/connection.c | 3 +-
src/or/main.c | 90 ++++++++++++++++++++++++------
src/or/main.h | 2 +
src/or/periodic.c | 2 +
src/test/include.am | 1 +
src/test/test.c | 1 +
src/test/test.h | 1 +
src/test/test_mainloop.c | 142 +++++++++++++++++++++++++++++++++++++++++++++++
11 files changed, 255 insertions(+), 28 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
