[tor-commits] [tor/master] Merge branch 'trove-2018-005_034'
nickm at torproject.org
nickm at torproject.org
Tue May 22 16:34:01 UTC 2018
commit a78957888957d0465a774ac938b71d680bec800f
Merge: 1afdb5b6c 6442417fd
Author: Nick Mathewson <nickm at torproject.org>
Date: Tue May 22 12:33:49 2018 -0400
Merge branch 'trove-2018-005_034'
changes/TROVE-2018-005 | 6 +++
src/or/dirauth/dirvote.c | 6 +++
src/or/protover.c | 34 ++++++++++++++++
src/or/protover.h | 1 +
src/rust/protover/ffi.rs | 14 +++++--
src/rust/protover/protover.rs | 93 +++++++++++++++++++++++++++++++++++++------
src/test/test_protover.c | 25 ++++++++++++
7 files changed, 163 insertions(+), 16 deletions(-)
More information about the tor-commits
mailing list