commit 2d43dd26b15d83b47ba3fe1320e4ebe63808028c Merge: 3c33175 cc55481 Author: Cecylia Bocovich cohosh@torproject.org Date: Thu Aug 27 16:45:05 2020 -0400

Merge branch 'issue/21314'

client/lib/interfaces.go | 3 +++ client/lib/lib_test.go | 41 ++++++++++++++++++++++------------------- client/lib/peers.go | 26 +++++++++++++++----------- client/lib/rendezvous.go | 10 +++++++++- client/lib/snowflake.go | 36 +++++++++++++++++++++++++++++++++++- client/snowflake.go | 38 +++++--------------------------------- 6 files changed, 89 insertions(+), 65 deletions(-)