commit 82b128277203b86f35739a424787bbb268a6cdeb Merge: 3ddfd5ff2 7c26f88fd Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 14 09:25:34 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

changes/bug27687 | 4 ++++ src/rust/protover/errors.rs | 3 +++ src/rust/protover/protover.rs | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-)