Merge branch 'privsep'

* privsep:
  server: Introduce privilege separation.
  server: Zap spurious space output by a_vformat.
  server: Make a_vformat public.
  server: Set admin socket permissions to match user.
  client: Capture server stderr and send it to the logfile.
  client: Better logging infrastructure.
  client: Clean up variable declarations.
  client: New options for setting user and group identities.
  client: Function for inserting arguments.
  peer, tunnels: New file-descriptor opening interface.

Conflicts:

	server/Makefile.am

diff --cc Makefile.am
Simple merge

diff --cc client/tripectl.c
Simple merge

diff --cc configure.ac
index 674116e37da66c091beb09518223100b608c387f,5b5eaa2cb94fbe791f9bf785c4ce89a7e5212764..61ed4a8fd1c1c25119d33bcd6989b15b9cc64d09
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -303,8 -300,8 +312,9 @@@ AC_CONFIG_FILES
    [Makefile]
    [common/Makefile]
    [uslip/Makefile]
 +  [pathmtu/Makefile]
    [client/Makefile]
+   [priv/Makefile]
    [server/Makefile]
    [proxy/Makefile]
    [pkstream/Makefile]

diff --cc server/Makefile.am
index 3c050a109a566ac1b22c06f332836200f0287bb4,f4fb936fabb8e3a584c1d018ecd28099d146fba3..e54b79789bdb3eb7c614c6fdf3759817c7db926e
--- 1/server/Makefile.am
--- 2/server/Makefile.am
+++ b/server/Makefile.am
@@@ -28,8 -28,6 +28,8 @@@ include $(top_srcdir)/vars.a
  sbin_PROGRAMS          =
  man_MANS               =
  
- LDADD                  = $(libtripe) $(catacomb_LIBS)
++LDADD                  = $(libtripe) $(libpriv) $(catacomb_LIBS)
 +
  ###--------------------------------------------------------------------------
  ### The main server.
  

diff --cc server/admin.c
Simple merge