commit bfcfeaed0772cd9238c3fa4d1c4a6db4f23ad2a3 Merge: cf8c3abff 46b06cd69 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 2 13:22:07 2018 -0400

Merge branch 'mikeperry_bug26214-rebased_squashed' into maint-0.3.4

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(-)