[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug25691_033_again_squashed' into maint-0.3.3
commit fa1890e97f19a444f8103c1207d7d18c02887b1f
Merge: 0ef432d45 0941c8bfe
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Sun May 27 10:03:11 2018 -0400
Merge remote-tracking branch 'public/bug25691_033_again_squashed' into maint-0.3.3
changes/bug25691_again | 6 +++++
src/or/circuitbuild.c | 67 ++++++++++++++++++++++++-----------------------
src/or/circuituse.c | 4 +--
src/or/control.c | 9 ++++---
src/or/entrynodes.c | 7 ++---
src/or/hs_common.c | 15 ++++++++---
src/or/nodelist.c | 39 ++++++++++++++++++++++++---
src/or/nodelist.h | 4 ++-
src/or/rendservice.c | 2 +-
src/or/routerlist.c | 6 ++---
src/test/test_hs.c | 1 +
src/test/test_hs_common.c | 3 ++-
12 files changed, 108 insertions(+), 55 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits