security/certificate-transparency: update 20160102 -> 20161015

PR:		213502
Changes:	https://github.com/google/certificate-transparency/commits/master

28 files changed, 41 insertions, 58 deletions

diff --git a/security/certificate-transparency/files/patch-Makefile.am b/security/certificate-transparency/files/patch-Makefile.am
index 01a95272bdfa..aa2136fe60c8 100644
--- a/security/certificate-transparency/files/patch-Makefile.am
+++ b/security/certificate-transparency/files/patch-Makefile.am
@@ -1,14 +1,6 @@
---- Makefile.am.orig	2016-02-02 11:35:23 UTC
+--- Makefile.am.orig	2016-10-14 17:11:57 UTC
 +++ Makefile.am
-@@ -3,7 +3,6 @@ ACLOCAL_AMFLAGS = -Im4
- AM_CPPFLAGS = \
- 	-I$(GMOCK_DIR)/include \
- 	-I$(GTEST_DIR)/include \
--	-Ithird_party/objecthash \
- 	$(evhtp_CFLAGS) \
- 	$(icu_CFLAGS) \
- 	$(json_c_CFLAGS)
-@@ -12,8 +11,6 @@ AM_CXXFLAGS = \
+@@ -11,8 +11,6 @@ AM_CXXFLAGS = \
  	-fno-exceptions
  
  BUILT_SOURCES = \
@@ -17,7 +9,7 @@
  	cpp/monitoring/prometheus/metrics.pb.cc \
  	cpp/monitoring/prometheus/metrics.pb.h \
  	proto/ct.pb.cc \
-@@ -124,9 +121,6 @@ endif
+@@ -131,9 +129,6 @@ endif
  cpp/gtest-all.cc: $(GTEST_DIR)/src/gtest-all.cc
  	$(AM_V_at)cp $^ $@
  
@@ -27,7 +19,7 @@
  test/testdata/urlfetcher_test_certs/localhost-key.pem: test/create_url_fetcher_test_certs.sh
  	$(AM_V_GEN)test/create_url_fetcher_test_certs.sh
  
-@@ -215,8 +209,6 @@ cpp_libtest_a_CPPFLAGS = \
+@@ -226,8 +221,6 @@ cpp_libtest_a_CPPFLAGS = \
  	-I$(GTEST_DIR) \
  	$(AM_CPPFLAGS)
  cpp_libtest_a_SOURCES = \
@@ -36,13 +28,3 @@
  	cpp/util/testing.cc
  
  cpp_server_ct_mirror_LDADD = \
-@@ -297,8 +289,7 @@ cpp_server_xjson_server_SOURCES = \
- 	cpp/server/server_helper.cc \
- 	cpp/server/xjson-server.cc \
- 	cpp/server/x_json_handler.cc \
--	cpp/util/json_wrapper.cc \
--	third_party/objecthash/objecthash.cc
-+	cpp/util/json_wrapper.cc
- 
- cpp_tools_ct_clustertool_LDADD = \
- 	cpp/libcore.a \
diff --git a/security/certificate-transparency/files/patch-configure.ac b/security/certificate-transparency/files/patch-configure.ac
index 3e37c44b11b8..919648849ca5 100644
--- a/security/certificate-transparency/files/patch-configure.ac
+++ b/security/certificate-transparency/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2016-02-02 11:35:23 UTC
+--- configure.ac.orig	2016-10-14 17:11:57 UTC
 +++ configure.ac
-@@ -83,9 +83,7 @@ AC_CHECK_HEADER([gtest/gtest.h],, [missi
+@@ -84,9 +84,7 @@ AC_CHECK_HEADER([gtest/gtest.h],, [missi
  AS_VAR_APPEND([CPPFLAGS], [" -I$GMOCK_DIR/include"])
  AC_CHECK_HEADER([gmock/gmock.h],, [missing_gmock=1])
  AS_VAR_APPEND([CPPFLAGS], [" -I$GTEST_DIR"])
@@ -10,16 +10,16 @@
  CPPFLAGS="$saved_CPPFLAGS"
  AS_IF([test -n "$missing_gtest"],
        [AC_MSG_ERROR([could not find a working Google Test])])
-@@ -105,7 +103,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt],,, 
+@@ -106,7 +104,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt],,, 
  
  AC_MSG_CHECKING([checking for gflags library])
  LIBS="-lgflags $LIBS"
--AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <gflags/gflags.h>], [google::ParseCommandLineFlags(NULL, NULL, true)])], [have_gflags=yes], [have_gflags=no])
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <gflags/gflags.h>], [gflags::ParseCommandLineFlags(NULL, NULL, true)])], [have_gflags=yes], [have_gflags=no])
+-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gflags/gflags.h>]], [[google::ParseCommandLineFlags(NULL, NULL, true)]])], [have_gflags=yes], [have_gflags=no])
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gflags/gflags.h>]], [[gflags::ParseCommandLineFlags(NULL, NULL, true)]])], [have_gflags=yes], [have_gflags=no])
  AC_MSG_RESULT([$have_gflags])
  AS_IF([test "x$have_gflags" = "xno"],
        [AC_MSG_ERROR([gflags library could not be found])])
-@@ -117,6 +115,9 @@ AC_MSG_RESULT([$have_glog])
+@@ -118,6 +116,9 @@ AC_MSG_RESULT([$have_glog])
  AS_IF([test "x$have_glog" = "xno"],
        [AC_MSG_ERROR([glog library could not be found])])
  
diff --git a/security/certificate-transparency/files/patch-cpp-client-ct.cc b/security/certificate-transparency/files/patch-cpp-client-ct.cc
index 8bf5e2344052..cf02f5cc3c18 100644
--- a/security/certificate-transparency/files/patch-cpp-client-ct.cc
+++ b/security/certificate-transparency/files/patch-cpp-client-ct.cc
@@ -1,6 +1,6 @@
---- cpp/client/ct.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/client/ct.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/client/ct.cc
-@@ -461,8 +461,8 @@ static void MakeCert() {
+@@ -451,8 +451,8 @@ static void MakeCert() {
  // (This means the relevant section should be last in the configuration.)
  // 1.2.3.1=DER:[raw encoding of proof]
  static void WriteProofToConfig() {
@@ -11,7 +11,7 @@
  
    string sct;
  
-@@ -489,8 +489,8 @@ static const char kPEMLabel[] = "SERVERI
+@@ -479,8 +479,8 @@ static const char kPEMLabel[] = "SERVERI
  // Wrap the proof in the format expected by the TLS extension,
  // so that we can feed it to OpenSSL.
  static void ProofToExtensionData() {
@@ -22,13 +22,14 @@
  
    string serialized_sct;
    PCHECK(util::ReadBinaryFile(FLAGS_sct_token, &serialized_sct))
-@@ -990,12 +990,12 @@ int Monitor() {
+@@ -939,13 +939,13 @@ int GetSTH() {
  // Exit code upon abnormal exit (CHECK failures): != 0
  // (on UNIX, 134 is expected)
  int main(int argc, char** argv) {
 -  google::SetUsageMessage(argv[0] + string(kUsage));
 +  gflags::SetUsageMessage(argv[0] + string(kUsage));
    util::InitCT(&argc, &argv);
+   ConfigureSerializerForV1CT();
  
    const string main_command(argv[0]);
    if (argc < 2) {
@@ -37,7 +38,7 @@
      return 1;
    }
  
-@@ -1035,7 +1035,7 @@ int main(int argc, char** argv) {
+@@ -983,7 +983,7 @@ int main(int argc, char** argv) {
    } else if (cmd == "sth") {
      ret = GetSTH();
    } else {
diff --git a/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc b/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc
index d20d0b3631a7..1623ad7f0f4c 100644
--- a/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-fetcher-remote_peer_test.cc
@@ -1,4 +1,4 @@
---- cpp/fetcher/remote_peer_test.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/fetcher/remote_peer_test.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/fetcher/remote_peer_test.cc
 @@ -1,5 +1,8 @@
  #include <gflags/gflags.h>
diff --git a/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc b/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc
index c49980c8a639..bde372e31594 100644
--- a/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-log-cluster_state_controller_test.cc
@@ -1,4 +1,4 @@
---- cpp/log/cluster_state_controller_test.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/log/cluster_state_controller_test.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/log/cluster_state_controller_test.cc
 @@ -1,3 +1,6 @@
 +// Without this, build will fail due to clash between onigposix.h
diff --git a/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc b/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc
index ffbbe6b076aa..177efefc9bc9 100644
--- a/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-log-etcd_consistent_store_test.cc
@@ -1,4 +1,4 @@
---- cpp/log/etcd_consistent_store_test.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/log/etcd_consistent_store_test.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/log/etcd_consistent_store_test.cc
 @@ -1,6 +1,9 @@
  #include "log/etcd_consistent_store.h"
diff --git a/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc b/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc
index e28b5b9acee5..fd8a94cf8528 100644
--- a/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-log-frontend_signer_test.cc
@@ -1,4 +1,4 @@
---- cpp/log/frontend_signer_test.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/log/frontend_signer_test.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/log/frontend_signer_test.cc
 @@ -1,5 +1,8 @@
  /* -*- indent-tabs-mode: nil -*- */
diff --git a/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc b/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc
index 8d7910851556..9db8990cee24 100644
--- a/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-log-frontend_test.cc
@@ -1,4 +1,4 @@
---- cpp/log/frontend_test.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/log/frontend_test.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/log/frontend_test.cc
 @@ -1,5 +1,8 @@
  /* -*- indent-tabs-mode: nil -*- */
diff --git a/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc b/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc
index de1ec8d75c68..65107926e52c 100644
--- a/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-log-log_lookup_test.cc
@@ -1,4 +1,4 @@
---- cpp/log/log_lookup_test.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/log/log_lookup_test.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/log/log_lookup_test.cc
 @@ -1,4 +1,7 @@
  /* -*- indent-tabs-mode: nil -*- */
diff --git a/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc b/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc
index 54e81ea47882..5f85720c4998 100644
--- a/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-log-tree_signer_test.cc
@@ -1,4 +1,4 @@
---- cpp/log/tree_signer_test.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/log/tree_signer_test.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/log/tree_signer_test.cc
 @@ -1,4 +1,7 @@
  /* -*- indent-tabs-mode: nil -*- */
diff --git a/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc b/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc
index 3863e2c6e0b6..2a7fa89a4de6 100644
--- a/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-net-url_fetcher_test.cc
@@ -1,4 +1,4 @@
---- cpp/net/url_fetcher_test.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/net/url_fetcher_test.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/net/url_fetcher_test.cc
 @@ -7,6 +7,9 @@
  #include <fcntl.h>
diff --git a/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc b/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc
index 80d8e91b98db..5f3814ddf0a7 100644
--- a/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc
+++ b/security/certificate-transparency/files/patch-cpp-server-ct-mirror.cc
@@ -1,4 +1,4 @@
---- cpp/server/ct-mirror.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/server/ct-mirror.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/server/ct-mirror.cc
 @@ -98,7 +98,7 @@ using cert_trans::Update;
  using cert_trans::UrlFetcher;
diff --git a/security/certificate-transparency/files/patch-cpp-server-ct-mirror_v2.cc b/security/certificate-transparency/files/patch-cpp-server-ct-mirror_v2.cc
index a8fac4657be6..2e3fae249770 100644
--- a/security/certificate-transparency/files/patch-cpp-server-ct-mirror_v2.cc
+++ b/security/certificate-transparency/files/patch-cpp-server-ct-mirror_v2.cc
@@ -1,4 +1,4 @@
---- cpp/server/ct-mirror_v2.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/server/ct-mirror_v2.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/server/ct-mirror_v2.cc
 @@ -91,7 +91,7 @@ using cert_trans::Update;
  using cert_trans::UrlFetcher;
diff --git a/security/certificate-transparency/files/patch-cpp-server-ct-server.cc b/security/certificate-transparency/files/patch-cpp-server-ct-server.cc
index e420a0e705b2..61de3a4df72c 100644
--- a/security/certificate-transparency/files/patch-cpp-server-ct-server.cc
+++ b/security/certificate-transparency/files/patch-cpp-server-ct-server.cc
@@ -1,4 +1,4 @@
---- cpp/server/ct-server.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/server/ct-server.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/server/ct-server.cc
 @@ -64,7 +64,7 @@ using cert_trans::TreeSigner;
  using cert_trans::UrlFetcher;
diff --git a/security/certificate-transparency/files/patch-cpp-server-ct-server_v2.cc b/security/certificate-transparency/files/patch-cpp-server-ct-server_v2.cc
index aa2681228cc2..fe3a4016cfe6 100644
--- a/security/certificate-transparency/files/patch-cpp-server-ct-server_v2.cc
+++ b/security/certificate-transparency/files/patch-cpp-server-ct-server_v2.cc
@@ -1,4 +1,4 @@
---- cpp/server/ct-server_v2.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/server/ct-server_v2.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/server/ct-server_v2.cc
 @@ -66,7 +66,7 @@ using cert_trans::TreeSigner;
  using cert_trans::UrlFetcher;
diff --git a/security/certificate-transparency/files/patch-cpp-server-log_processes.cc b/security/certificate-transparency/files/patch-cpp-server-log_processes.cc
index 396bde6fa467..9b5e2b4a5517 100644
--- a/security/certificate-transparency/files/patch-cpp-server-log_processes.cc
+++ b/security/certificate-transparency/files/patch-cpp-server-log_processes.cc
@@ -1,4 +1,4 @@
---- cpp/server/log_processes.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/server/log_processes.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/server/log_processes.cc
 @@ -23,7 +23,7 @@ DEFINE_int32(cleanup_frequency_seconds, 
  using cert_trans::Counter;
diff --git a/security/certificate-transparency/files/patch-cpp-server-server_helper.cc b/security/certificate-transparency/files/patch-cpp-server-server_helper.cc
index be39a37ecb1d..434fb8d39a67 100644
--- a/security/certificate-transparency/files/patch-cpp-server-server_helper.cc
+++ b/security/certificate-transparency/files/patch-cpp-server-server_helper.cc
@@ -1,4 +1,4 @@
---- cpp/server/server_helper.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/server/server_helper.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/server/server_helper.cc
 @@ -4,7 +4,7 @@
  #include "util/fake_etcd.h"
diff --git a/security/certificate-transparency/files/patch-cpp-server-xjson-server.cc b/security/certificate-transparency/files/patch-cpp-server-xjson-server.cc
index 08468cc2e84f..6b5a7c171a82 100644
--- a/security/certificate-transparency/files/patch-cpp-server-xjson-server.cc
+++ b/security/certificate-transparency/files/patch-cpp-server-xjson-server.cc
@@ -1,4 +1,4 @@
---- cpp/server/xjson-server.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/server/xjson-server.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/server/xjson-server.cc
 @@ -63,7 +63,7 @@ using cert_trans::UrlFetcher;
  using cert_trans::XJsonHttpHandler;
diff --git a/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc b/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc
index 9b4565d7e10f..73845faa7dcd 100644
--- a/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc
+++ b/security/certificate-transparency/files/patch-cpp-tools-dump_sth.cc
@@ -1,4 +1,4 @@
---- cpp/tools/dump_sth.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/tools/dump_sth.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/tools/dump_sth.cc
 @@ -26,11 +26,11 @@ void DumpSth(const char* filename) {
  
diff --git a/security/certificate-transparency/files/patch-cpp-util-bignum.h b/security/certificate-transparency/files/patch-cpp-util-bignum.h
index 5ff4950859ad..72ed93760e60 100644
--- a/security/certificate-transparency/files/patch-cpp-util-bignum.h
+++ b/security/certificate-transparency/files/patch-cpp-util-bignum.h
@@ -1,4 +1,4 @@
---- cpp/util/bignum.h.orig	2016-02-02 11:35:23 UTC
+--- cpp/util/bignum.h.orig	2016-10-14 17:11:57 UTC
 +++ cpp/util/bignum.h
 @@ -3,6 +3,7 @@
  
diff --git a/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc b/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc
index 567370b5e3b4..0995ceb17c44 100644
--- a/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc
+++ b/security/certificate-transparency/files/patch-cpp-util-etcd_masterelection.cc
@@ -1,4 +1,4 @@
---- cpp/util/etcd_masterelection.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/util/etcd_masterelection.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/util/etcd_masterelection.cc
 @@ -24,7 +24,7 @@ DEFINE_string(node_id, "", "unique node 
  
diff --git a/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc b/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc
index 92f4a642715e..5b8cdd9eb91a 100644
--- a/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-util-etcd_test.cc
@@ -1,4 +1,4 @@
---- cpp/util/etcd_test.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/util/etcd_test.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/util/etcd_test.cc
 @@ -1,3 +1,6 @@
 +// Without this, build will fail due to clash between onigposix.h
diff --git a/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc b/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc
index dc30b260d8e0..876f2e3c9798 100644
--- a/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-util-fake_etcd_test.cc
@@ -1,4 +1,4 @@
---- cpp/util/fake_etcd_test.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/util/fake_etcd_test.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/util/fake_etcd_test.cc
 @@ -2,6 +2,9 @@
  
diff --git a/security/certificate-transparency/files/patch-cpp-util-init.cc b/security/certificate-transparency/files/patch-cpp-util-init.cc
index c2a217e24685..59ceecd9dde9 100644
--- a/security/certificate-transparency/files/patch-cpp-util-init.cc
+++ b/security/certificate-transparency/files/patch-cpp-util-init.cc
@@ -1,4 +1,4 @@
---- cpp/util/init.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/util/init.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/util/init.cc
 @@ -49,8 +49,8 @@ void LibEventLog(int severity, const cha
  
diff --git a/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc b/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc
index 9cfdfabd89df..001748361172 100644
--- a/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-util-libevent_wrapper_test.cc
@@ -1,4 +1,4 @@
---- cpp/util/libevent_wrapper_test.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/util/libevent_wrapper_test.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/util/libevent_wrapper_test.cc
 @@ -1,5 +1,8 @@
  #include "util/libevent_wrapper.h"
diff --git a/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc b/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc
index d9b3359eccfd..3255920e57a4 100644
--- a/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc
+++ b/security/certificate-transparency/files/patch-cpp-util-masterelection_test.cc
@@ -1,4 +1,4 @@
---- cpp/util/masterelection_test.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/util/masterelection_test.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/util/masterelection_test.cc
 @@ -3,6 +3,9 @@
  #include <event2/thread.h>
diff --git a/security/certificate-transparency/files/patch-cpp-util-testing.cc b/security/certificate-transparency/files/patch-cpp-util-testing.cc
index 00f0df865454..99c1a14d021e 100644
--- a/security/certificate-transparency/files/patch-cpp-util-testing.cc
+++ b/security/certificate-transparency/files/patch-cpp-util-testing.cc
@@ -1,4 +1,4 @@
---- cpp/util/testing.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/util/testing.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/util/testing.cc
 @@ -3,6 +3,9 @@
  #include <event2/thread.h>
diff --git a/security/certificate-transparency/files/patch-cpp_util_bench__etcd.cc b/security/certificate-transparency/files/patch-cpp_util_bench__etcd.cc
index 1d886e185061..dc7871a5cb8c 100644
--- a/security/certificate-transparency/files/patch-cpp_util_bench__etcd.cc
+++ b/security/certificate-transparency/files/patch-cpp_util_bench__etcd.cc
@@ -1,4 +1,4 @@
---- cpp/util/bench_etcd.cc.orig	2016-02-02 11:35:23 UTC
+--- cpp/util/bench_etcd.cc.orig	2016-10-14 17:11:57 UTC
 +++ cpp/util/bench_etcd.cc
 @@ -105,7 +105,7 @@ void test_etcd(int thread_num) {