commit ec1ced3cc1eb99fe3c83c89dac35a67843874ba1 Merge: ac9d08f66 db2a9180b Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 30 08:44:58 2018 -0400
Merge remote-tracking branch 'teor/bug26924'
changes/bug26924 | 4 ++++ changes/bug26927 | 4 ++++ src/core/or/connection_or.c | 14 +++++++++----- 3 files changed, 17 insertions(+), 5 deletions(-)