tree 3de47aba03b51a1d707bac4b937efbea882bd831
parent 0bd0a1db4dcd4eee07c8dd8819ba164f2e9fc5b2
parent 1fbd9b4d709dafdb958424d2cf289c72379b5cb7
author Andy Bavier <acb@cs.princeton.edu> 1445868279 -0400
committer Andy Bavier <acb@cs.princeton.edu> 1445868279 -0400

Merge branch 'hotfix/compute-race'