Merge branch 'master' into pollingwatcher

diff --cc src/Makefile.am
index e44190d,f1811b3..34d0809
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -18,11 -18,9 +18,11 @@@ noinst_LIBRARIES=libutils.
  sbin_PROGRAMS=blockad
  man_MANS=blockad.8
  libutils_a_SOURCES=Address.cc ConfFile.cc Regex.cc StdioFile.cc               \
- Watcher.cc Address.h ConfFile.h Regex.h StdioFile.h Watcher.h log.h   \
+ Watcher.cc Address.h ConfFile.h Regex_.h StdioFile.h Watcher.h log.h  \
  log.cc IOError.cc IOError.h nonblock.cc utils.h execute.cc            \
 -BlockMethod.h BlockMethod.cc
 +BlockMethod.h BlockMethod.cc WatcherImplementation.h                  \
 +WatcherImplementation.cc InotifyWatcher.cc InotifyWatcher.h           \
 +PollingWatcher.cc PollingWatcher.h timeval.h
  blockad_SOURCES=blockad.cc iptables.cc hosts.deny.cc
  LDADD=libutils.a
  EXTRA_DIST=${man_MANS}

diff --cc src/blockad.cc
index 88f3aaf,74b5a0e..6b87b9f
--- 1/src/blockad.cc
--- 2/src/blockad.cc
+++ b/src/blockad.cc
@@@ -18,9 -18,8 +18,9 @@@
  #include "Watcher.h"
  #include "ConfFile.h"
  #include "Address.h"
- #include "Regex.h"
+ #include "Regex_.h"
  #include "BlockMethod.h"
 +#include "timeval.h"
  #include "log.h"
  #include "utils.h"
  #include <sys/select.h>