commit bd4c50f36b366f61f18769c17e17d77d75891465 Merge: 5e94c9384 82b128277 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 14 09:25:34 2018 -0400

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