[tor-commits] [tor/master] Merge remote-tracking branch 'isis/bug25127_redux'

[nickm@xxxxxxxxxxxxxx]

commit a75ae628c74d8105d7b021b051ffd6eaaed08904
Merge: 7aa94f744 45c59eff6
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sun Feb 11 16:17:41 2018 -0500

    Merge remote-tracking branch 'isis/bug25127_redux'

 src/rust/protover/ffi.rs      | 2 +-
 src/rust/protover/protover.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits