AC

.gitignore

@@ -4,10 +4,10 @@
 *.lo
 *.log
 *.o
-*.s
 *.scan
 *.status
 *.tar.*
+*.trs
 *~
 .DS_Store
 .deps
@@ -17,6 +17,7 @@ INSTALL
 Makefile
 Makefile.in
 aclocal.m4
+android-toolchain
 autom4te.cache
 build
 compile
@@ -43,11 +44,37 @@ probes_dnscrypt_proxy.h
 src/*.o
 src/.deps
 src/Makefile.in
-src/proxy/Makefile.in
-src/proxy/dnscrypt-proxy
 src/hostip/hostip
-src/include/dnscrypt/version.h
 src/include/Doxyfile
+src/include/dnscrypt/version.h
+src/include/html/
+src/include/latex/
+src/libevent-modified/include/event2/event-config.h
+src/libevent-modified/libevent.pc
+src/libevent-modified/libevent_openssl.pc
+src/libevent-modified/libevent_pthreads.pc
+src/libevent-modified/m4/libtool.m4
+src/libevent-modified/m4/ltoptions.m4
+src/libevent-modified/m4/ltversion.m4
+src/libevent-modified/sample/dns-example
+src/libevent-modified/sample/event-test
+src/libevent-modified/sample/hello-world
+src/libevent-modified/sample/http-server
+src/libevent-modified/sample/signal-test
+src/libevent-modified/sample/time-test
+src/libevent-modified/test/bench
+src/libevent-modified/test/bench_cascade
+src/libevent-modified/test/bench_http
+src/libevent-modified/test/bench_httpclient
+src/libevent-modified/test/regress
+src/libevent-modified/test/rpcgen-attempted
+src/libevent-modified/test/test-changelist
+src/libevent-modified/test/test-eof
+src/libevent-modified/test/test-init
+src/libevent-modified/test/test-ratelim
+src/libevent-modified/test/test-script.sh
+src/libevent-modified/test/test-time
+src/libevent-modified/test/test-weof
 src/libevent/*.la
 src/libevent/*.lo
 src/libevent/*.pc
@@ -74,7 +101,22 @@ src/libevent/test/test-init
 src/libevent/test/test-ratelim
 src/libevent/test/test-time
 src/libevent/test/test-weof
-src/libnacl/okcompilers/c
-src/libnacl/okcompilers/do
+src/libnacl/
+src/libsodium/m4/argz.m4
+src/libsodium/m4/libtool.m4
+src/libsodium/m4/ltdl.m4
+src/libsodium/m4/ltoptions.m4
+src/libsodium/m4/ltsugar.m4
+src/libsodium/m4/ltversion.m4
+src/libsodium/m4/lt~obsolete.m4
+src/libsodium/src/libsodium/include/sodium/version.h
+src/plugins/.tmp
+src/plugins/example-ldns-blocking/example-ldns-blocking.plist/
+src/plugins/example-ldns-opendns-deviceid/example-ldns-opendns-deviceid.plist/
+src/proxy/Makefile.in
+src/proxy/dnscrypt-proxy
+src/proxy/registry.txt
 stamp-*
+test-driver
 testing
+update-changelog.sh

.travis.yml

@@ -0,0 +1,17 @@
+language: c
+compiler:
+ - gcc
+before_script:
+ - sudo apt-get install libldns-dev
+ - git clone git://github.com/jedisct1/libsodium.git
+ - cd libsodium
+ - git checkout 1.0.1
+ - ./autogen.sh
+ - ./configure --disable-dependency-tracking
+ - sudo make install
+ - sudo ldconfig
+ - cd ..
+ - ./autogen.sh
+ - ./configure --disable-dependency-tracking --enable-plugins
+script:
+ - make

COPYING

@@ -2,9 +2,9 @@
 dnscrypt-proxy is covered by the following license :
 
 /*
- * Copyright (c) 2011-2013 Frank Denis <j at pureftpd dot org>
+ * Copyright (c) 2011-2015 Frank Denis <j at pureftpd dot org>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
@@ -24,10 +24,9 @@ maintained libraries.
 
 The externally maintained libraries used by dnscrypt-proxy are:
 
-  - NaCl (http://nacl.cr.yp.to/). Public domain.
+  - libsodium (https://github.com/jedisct1/libsodium). 2-clause BSD
+    license. Based on NaCl (http://nacl.cr.yp.to), public domain. See
+    src/libsodium/{COPYING,AUTHORS}.
 
   - libevent (http://libevent.org/). 3-clause BSD license.
     See src/libevent/LICENSE.
-
-  - salsa20_random.c reuses code from OpenBSD written by Damien Miller.
-    BSD license.