Merge branch 'rel/auth-3.3'

Conflicts:
	.travis.yml
	debian-pdns/rules
	modules/remotebackend/testrunner.sh
	modules/remotebackend/unittest_http.rb
	modules/remotebackend/unittest_json.rb
	modules/remotebackend/unittest_pipe.rb
	modules/remotebackend/unittest_post.rb
	pdns.spec
	pdns/Makefile.am
	pdns/misc.hh
	regression-tests/start-test-stop

diff --cc debian-pdns/rules
index a8f72986617f32449e7f7c21bcb06c1890e5652c,02598ac792939583681c0f3c6291601ebd1ba53c..a0cdf31f795fae0fe6162613e36d637ed44543d1
--- 1/debian-pdns/rules
--- 2/debian-pdns/rules
+++ b/debian-pdns/rules
@@@ -133,8 -133,8 +133,9 @@@ binary-main-prepare
  
        install -d -m 755 -o root -g root "$(tools_tmpdir)"/DEBIAN
  
 -      for prog in dnsbulktest dnsreplay dnsscan dnsscope dnstcpbench dnswasher nproxy nsec3dig ; do \
+       #FIXME: shell loops hide errors
 +      for prog in dnsbulktest dnsreplay dnsscan dnsscope dnstcpbench dnswasher \
 +              nproxy dnsdist nsec3dig ; do \
                mv "$(tmpdir)"/usr/bin/$$prog "$(tools_tmpdir)"/usr/bin ; \
                [ -e "$(tmpdir)"/usr/share/man/man8/"$$prog".8 ] && \
                        mv "$(tmpdir)"/usr/share/man/man8/"$$prog".8 "$(tools_tmpdir)"/usr/share/man/man8/ ; \

diff --cc pdns.spec
index 87b9f65147168b79114e9f5fe3b8bd0145861581,5a850126c5e7217f39109024d0b704fc4440c112..4494547944d2e8b341c735226a2282a3702e584b
--- 1/pdns.spec
--- 2/pdns.spec
+++ b/pdns.spec
@@@ -1,6 -1,6 +1,6 @@@
  BuildRoot: /tmp/pdns
  Name: pdns-static
- Version: 3.2
 -Version: 3.3rc1
++Version: 3.3
  Release: 1
  Summary: extremely powerful and versatile nameserver
  License: GPL

diff --cc pdns/nameserver.cc
Simple merge