commit ce6a7e1ff666ad61432fd1715751d2801e1de75a Merge: c00527b3a bfcfeaed0 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 2 13:22:14 2018 -0400

Merge branch 'maint-0.3.4' into release-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(-)