commit 552218437ccbe8fc13ad431fbe2167331b886497
Merge: 062603156 0c6eabf08
Author: Nick Mathewson <[email protected]>
Date: Thu Nov 9 09:20:55 2017 -0500
Merge branch 'ticket12062_squashed'
changes/bug12062 | 16 ++++++++++++++++
src/or/connection.c | 6 +++++-
src/or/dns.c | 4 ++--
src/or/main.c | 14 +++++++++-----
src/or/networkstatus.c | 9 +++++++++
src/or/routerlist.c | 2 +-
6 files changed, 42 insertions(+), 9 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
