commit 8ae9ed6287649a67a1cef5636a8042dfa6a341c0
Merge: d17ddb839 22845df2a
Author: Nick Mathewson <[email protected]>
Date: Mon Apr 16 10:06:21 2018 -0400
Merge branch 'maint-0.3.3' into release-0.3.3
changes/bug25226 | 4 +++
src/or/networkstatus.c | 1 +
src/or/or.h | 6 -----
src/or/relay.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++---
src/or/relay.h | 1 +
5 files changed, 70 insertions(+), 9 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
