commit 7edc594ee732960733d34309980d0e7190e35fb2
Merge: d1eac7830 169bc670d
Author: Nick Mathewson <ni...@torproject.org>
Date: Tue Oct 23 19:18:23 2018 -0400
Merge branch 'maint-0.3.3' into maint-0.3.4
changes/bug27740 | 4 ++++
changes/bug27804 | 3 +++
src/rust/protover/ffi.rs | 10 ++++------
src/test/test_protover.c | 1 +
4 files changed, 12 insertions(+), 6 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
