commit 6399ef9d4fa7d1dced903b43f329a43d3a80dfc7 Merge: 3eb9064 62fddab Author: Cecylia Bocovich <cohosh@torproject.org> Date: Thu Apr 11 09:57:38 2019 -0400 Merge branch 'deadlock' proxy-go/snowflake.go | 57 +++++++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 25 deletions(-)