Change Details

``` commit a4fd89fddba49c56e77f131fe95feffa8d7cf6ed Author: John Newbery <john@johnnewbery.com> Date: Fri Mar 24 12:35:28 2017 -0400 Make forknotify.py more robust forknotify would intermittently fail because the alert file was not being written fast enough. This commit adds a timeout so the test does not fail immediately. ``` There may be other relevant changes attached to the following merge commit:

commit 12af74b289f8cdc6caf850dc6c802f9936b1e8b3 Merge: 2b477e6aa a4fd89fdd Author: MarcoFalke <falke.marco@gmail.com> Date: Sun Apr 2 12:51:58 2017 +0200 Merge #10072: Remove sources of unreliablility in extended functional tests a4fd89f Make forknotify.py more robust (John Newbery) 1f3d78b Wait for connection to open in bip9-softforks.py (John Newbery) Tree-SHA512: de7d0002ee62ad97059b6f6c89b11f6e9901e3b4164ef6906bcd61e4ca499c277d9034784755966e5baf599869fad611b0b18f5547a384ceb5b7db3cc5bbd132

```commit 12af74b289f8cdc6caf850dc6c802f9936b1e8b3 commit a4fd89fddba49c56e77f131fe95feffa8d7cf6edMerge: 2b477e6aa a4fd89fdd Author: John Newbery <john@johnnewberyMarcoFalke <falke.marco@gmail.com> Date: Fri Mar 24Sun Apr 2 12:35:251:58 2017 -0400+0200 Make forknotify.py more robustMerge #10072: Remove sources of unreliablility in extended functional tests forknotify would intermittently fail because the alert file was nota4fd89f Make forknotify.py more robust (John Newbery) being written fast enough. This commit adds a timeout so the test does not fail immediately. ```1f3d78b Wait for connection to open in bip9-softforks.py (John Newbery) There may be other relevant changes attached to the following merge commit: Tree-SHA512: de7d0002ee62ad97059b6f6c89b11f6e9901e3b4164ef6906bcd61e4ca499c277d9034784755966e5baf599869fad611b0b18f5547a384ceb5b7db3cc5bbd132