commit 71e563f268a0bae3eb7886cefcef4c6accef285b Merge: b81ce1fbc 700f5bcc4 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 17 09:38:26 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

changes/bug27177 | 4 ++++ src/rust/protover/protoset.rs | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)