commit 169f238c238363ba0311aeea9ead4553846d6be3 Merge: 63e08f56b 5c0dd1aa9 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Sep 21 16:28:32 2018 -0400 Merge remote-tracking branch 'onionk/protover-rust1' changes/ticket27814 | 3 +++ src/core/include.am | 2 +- src/core/{proto => or}/protover_rust.c | 0 3 files changed, 4 insertions(+), 1 deletion(-)