commit 49b5ad6b75f5f9e223a92033d9b3930e3e1d132f
Merge: b440560b8 e05414d24
Author: Nick Mathewson <[email protected]>
Date: Fri Sep 15 14:39:23 2017 -0400
Merge branch 'bug23533_031' into maint-0.3.1
changes/bug23533 | 4 ++++
src/or/channel.c | 2 +-
src/or/channeltls.c | 2 +-
src/or/rephist.c | 4 ++--
4 files changed, 8 insertions(+), 4 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
