Merge commit 'd3f50ede127df338f575e188566035b2a46cf6c6' into thread-next

diff --cc configure.ac
index 2f37f9d0e78fb7b7a30b3c39f4b58e3dfcd2a58f,f8ab15375b5cea659bb2c2c186abf27be107deea..b3735123009ece14c10d9e51e40f88053eac4bbe
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -36,6 -36,18 +36,12 @@@ AC_ARG_ENABLE([memcheck]
    [enable_memcheck=yes]
  )
  
 -AC_ARG_ENABLE([pthreads],
 -  [AS_HELP_STRING([--enable-pthreads], [enable POSIX threads support @<:@try@:>@])],
 -  [],
 -  [enable_pthreads=try]
 -)
 -
+ AC_ARG_ENABLE([compact-tries],
+   [AS_HELP_STRING([--enable-compact-tries], [use 4-way tries instead of 16-way ones @<:@no@:>@])],
+   [],
+   [enable_compact_tries=no]
+ )
+ 
  AC_ARG_ENABLE([libssh],
    [AS_HELP_STRING([--enable-libssh], [enable LibSSH support in RPKI @<:@try@:>@])],
    [],
@@@ -475,6 -479,8 +485,7 @@@ AC_MSG_RESULT([        Object directory
  AC_MSG_RESULT([        Iproute2 directory:    $iproutedir])
  AC_MSG_RESULT([        System configuration:  $sysdesc])
  AC_MSG_RESULT([        Debugging:             $enable_debug])
 -AC_MSG_RESULT([        POSIX threads:         $enable_pthreads])
+ AC_MSG_RESULT([        Compact tries:         $enable_compact_tries])
  AC_MSG_RESULT([        Routing protocols:     $protocols])
  AC_MSG_RESULT([        LibSSH support in RPKI:        $enable_libssh])
  AC_MSG_RESULT([        Kernel MPLS support:   $enable_mpls_kernel])

diff --cc filter/data.h
Simple merge