timing -> timing out
1.4.0 -> 1.4.1
Merge branch 'master' of github.com:jedisct1/dnscrypt-proxy

* 'master' of github.com:jedisct1/dnscrypt-proxy:
  Do not use the same description for 2 different configurations
  Update ChangeLog
  libevent - [Bugfix] fix bufferevent setwatermark suspend_read
  libevent - regress_buffer: fix 'memcmp' compare size