From 0087f0740288c6a222b5fc87dd9df989fa6b377e Mon Sep 17 00:00:00 2001
From: xd009642 <danielmckenna93@gmail.com>
Date: Sun, 7 Oct 2018 16:34:44 +0100
Subject: [PATCH] Updated changelog and reverted .travis.yml

---
 .travis.yml  | 1 -
 CHANGELOG.md | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ee104abf49..3e584c26de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -141,7 +141,6 @@ branches:
     # bors-ng branches; see https://bors-ng.github.io/getting-started/
     - trying
     - staging
-    - issue-947
 
 notifications:
   email:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4de6ade247..d3e29dec22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   ([#930](https://github.com/nix-rust/nix/pull/930))
 - Added `futimens` and `utimesat` wrappers ([#944](https://github.com/nix-rust/nix/pull/944))
   and a `utimes` wrapper ([#946](https://github.com/nix-rust/nix/pull/946)).
+- Added support for `ptrace` on BSD operating systems ([#949](https://github.com/nix-rust/nix/pull/949))
+- Added `ptrace` functions for reads and writes to tracee memory ([#949](https://github.com/nix-rust/nix/pull/949))
 
 ### Changed
 - Increased required Rust version to 1.22.1/