commit 841ed9dbb982d5b0ffb9a5b17b1e4bf2e02f95f2
Merge: ca2d9cbb9 236c92a0a
Author: Nick Mathewson <ni...@torproject.org>
Date: Mon Mar 26 19:47:44 2018 -0400
Merge remote-tracking branch 'dgoulet/bug24904_033_01' into maint-0.3.3
changes/bug24904 | 4 ++++
src/or/channel.c | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
