[tor-commits] [tor/master] Merge branch 'mikeperry_bug26214-rebased_squashed'
nickm at torproject.org
nickm at torproject.org
Thu Jun 21 13:36:45 UTC 2018
commit 2ad062ee601bc30594b81a33404662fbd59ef8b1
Merge: d46969e82 46b06cd69
Author: Nick Mathewson <nickm at torproject.org>
Date: Thu Jun 21 09:20:03 2018 -0400
Merge branch 'mikeperry_bug26214-rebased_squashed'
changes/bug26214 | 3 +++
src/or/or.h | 1 +
src/or/relay.c | 24 ++++++++++++++++++++++--
src/test/test_relaycell.c | 17 ++++++++++++++++-
4 files changed, 42 insertions(+), 3 deletions(-)
More information about the tor-commits
mailing list