commit b81ce1fbcc969f80663a01ad01ae13f5d1b4a828 Merge: 1533e0c35 ac721bd3b Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 17 09:29:46 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

changes/bug27164 | 4 ++++ src/rust/protover/protoset.rs | 14 +++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-)