diff options
| -rw-r--r-- | src/testdir/test_channel.py | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py index 40a2043cc0..039a9de91e 100644 --- a/src/testdir/test_channel.py +++ b/src/testdir/test_channel.py @@ -133,7 +133,7 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler): elif decoded[1] == '!quit!': # we're done self.server.shutdown() - break + return elif decoded[1] == '!crash!': # Crash! 42 / 0 diff --git a/src/version.c b/src/version.c index 66739aa29d..9b9702aa27 100644 --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1291, +/**/ 1290, /**/ 1289, |