Merge branch '3.4-maint'

* 3.4-maint:
  Update NEWS
  Avoid TOCTOU issue when deciding if config is valid

diff --cc doc/NEWS.adoc
index 8b99758660cbeb623482fba42e405a4402f38bbd,907c7e800467d908dd068c2afc9c268e817a09f4..1abc33c9b3a5e668ef2ed9b8f68dfaad2aaa8e41
--- 1/doc/NEWS.adoc
--- 2/doc/NEWS.adoc
+++ b/doc/NEWS.adoc
@@@ -1,28 -1,17 +1,39 @@@
  ccache news
  ===========
  
 +ccache 3.5
 +----------
 +Release date: unknown
 +
 +New features and enhancements
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
 +- Renamed `CCACHE_CC` to `CCACHE_COMPILER` (keeping the former as a deprecated
 +  alias).
 +
 +- It is now possible to let ccache hash a precomputed checksum file instead of
 +  the full content of a precompiled header. This can save time for large
 +  precompiled headers. Note that the build system needs to keep the checksum
 +  file in sync with the precompiled header for this to work.
 +
 +- Added ``stats updated'' timestamp in `ccache -s` output. This can be useful
 +  if you wonder whether ccache actually was used for your last build.
 +
 +- The content of the `-fsanitize-blacklist` file is now included in the hash,
 +  so updates to the file will now correctly result in separate cache entries.
 +
 +
+ ccache 3.4.3
+ -----------
+ Release date: unknown
+ 
+ Bug fixes
+ ~~~~~~~~~
+ 
+ - Fixed a race condition when creating the initial config file in the cache
+   directory.
+ 
+ 
  ccache 3.4.2
  ------------
  Release date: 2018-03-25

diff --cc src/ccache.c
Simple merge

diff --cc src/conf.c
Simple merge

diff --cc unittest/test_conf.c
Simple merge