[tor-commits] [snowflake/master] Merge branch 'ticket30125'

[cohosh@xxxxxxxxxxxxxx]

commit d11e55aabe3753dbddca18ae084c80ad09e282d3
Merge: d4c5d4e b4a4a25
Author: Cecylia Bocovich <cohosh@xxxxxxxxxxxxxx>
Date:   Tue Apr 16 12:59:56 2019 -0400

    Merge branch 'ticket30125'

 broker/broker.go           |   7 +++
 client/snowflake.go        |  18 +++---
 common/safelog/log.go      |  59 +++++++++++++++++++
 common/safelog/log_test.go | 140 +++++++++++++++++++++++++++++++++++++++++++++
 proxy-go/snowflake.go      |   7 ++-
 server/server.go           |  54 +----------------
 server/server_test.go      | 135 -------------------------------------------
 7 files changed, 224 insertions(+), 196 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits