commit 77712a5fa29f135e0a79ed9122f28c5dcb902e77 Merge: 16430fdaf 59a88b3c3 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jan 17 12:04:50 2019 -0500 Merge remote-tracking branch 'tor-github/pr/645' src/feature/client/transports.c | 12 ++++++------ src/test/test_pt.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-)