commit a4ab273a0dafdd85e8e9f204c6e3e092282d3620 Merge: 5199b9b33 355338331 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 20 10:03:52 2018 -0500

Merge remote-tracking branch 'fristonio/ticket-25261'

changes/ticket25261 | 3 +++ src/or/connection.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)