commit 0f4f4fdcf56b88cd36bc94e8a45ccd9c5dce3a60 Merge: 5d950f3ed 07e4b09b5 Author: George Kadianakis desnacked@riseup.net Date: Tue May 14 15:15:09 2019 +0300
Merge branch 'tor-github/pr/1006'
src/core/or/protover.c | 6 ++++-- src/core/or/protover.h | 1 + src/rust/protover/ffi.rs | 1 + src/rust/protover/protover.rs | 8 ++++++-- 4 files changed, 12 insertions(+), 4 deletions(-)