commit 2e3dce604ec8de261763bc49e5117952ab19c93c
Merge: c62ab5417 ff70cc84f
Author: Nick Mathewson <[email protected]>
Date: Wed Jun 13 09:57:10 2018 -0400
Merge branch 'maint-0.3.2' into release-0.3.2
changes/bug25686_diagnostic | 4 ++++
src/or/directory.c | 5 +++--
src/or/router.c | 8 +++++++-
3 files changed, 14 insertions(+), 3 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
