commit 169bc670ddf9fe898800a2814a1ec30dcc3249da Merge: 93fd924bd 42558df7c Author: Nick Mathewson <nickm@torproject.org> Date: Tue Oct 23 19:17:48 2018 -0400 Merge remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3 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(-)