commit d96dc2060a0470a4607db6f2991ea7c2c3508e23 Merge: 5278d72f9 841ed9dbb Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 26 19:47:48 2018 -0400

Merge branch 'maint-0.3.3'

changes/bug24904 | 4 ++++ src/or/channel.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)