Merge remote-tracking branch 'teor/ticket26702-atomically'
commitc43e81a5a3afb9d1ed9808104672b3954cdd7005
authorNick Mathewson <nickm@torproject.org>
Wed, 18 Jul 2018 20:30:11 +0000 (18 16:30 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 18 Jul 2018 20:30:11 +0000 (18 16:30 -0400)
tree7f484edf2b5843ddcbda7989e91c512433874b5e
parent42c02097db1dd791d2bd8af78f91658589cf4988
parent08b82409d462bae454b073a9913f199b4c75ed3b
Merge remote-tracking branch 'teor/ticket26702-atomically'