Resolve merge conflict

diff --cc configure.ac
Simple merge

diff --cc src/openvpn/buffer.c
Simple merge

diff --cc src/openvpn/console_builtin.c
Simple merge

diff --cc src/openvpn/console_systemd.c
Simple merge

diff --cc src/openvpn/crypto.c
index ec85ae4e4d54ef11e651a00a158a1286f812abf9,cc3c7b63875dbe84bb1c84d7ac28440111b0ffa3..e265ac7cb0b4e02ddcbbe42027a2b2aac2f99d58
--- 1/src/openvpn/crypto.c
--- 2/src/openvpn/crypto.c
+++ b/src/openvpn/crypto.c
@@@ -1261,9 -1261,9 +1261,9 @@@ read_key_file(struct key2 *key2, const 
          fd = platform_open(file, O_RDONLY, 0);
          if (fd == -1)
          {
-             msg(M_ERR, "Cannot open file key file '%s'", file);
+             msg(M_ERR, "Cannot open key file '%s'", file);
          }
 -        size = read(fd, in.data, in.capacity);
 +        size = platform_read(fd, in.data, in.capacity);
          if (size < 0)
          {
              msg(M_FATAL, "Read error on key file ('%s')", file);

diff --cc src/openvpn/crypto_openssl.c
Simple merge

diff --cc src/openvpn/error.c
Simple merge

diff --cc src/openvpn/forward.c
Simple merge

diff --cc src/openvpn/init.c
Simple merge

diff --cc src/openvpn/list.c
Simple merge

diff --cc src/openvpn/manage.c
Simple merge

diff --cc src/openvpn/misc.c
index 81b7e6fa4c4a45e8bec192b74c69e6be36111214,0adb164e49a28794c237ff354ab138f264d6b766..92e842eff4f488a9a553f8b6264c187fff71f375
--- 1/src/openvpn/misc.c
--- 2/src/openvpn/misc.c
+++ b/src/openvpn/misc.c
@@@ -145,28 -142,7 +145,6 @@@ run_up_down(const char *command
      gc_free(&gc);
  }
  
- /* Write our PID to a file */
- void
- write_pid(const char *filename)
- {
-     if (filename)
-     {
-         unsigned int pid = 0;
-         FILE *fp = platform_fopen(filename, "w");
-         if (!fp)
-         {
-             msg(M_ERR, "Open error on pid file %s", filename);
-         }
- 
-         pid = platform_getpid();
-         fprintf(fp, "%u\n", pid);
-         if (platform_fclose(fp))
-         {
-             msg(M_ERR, "Close error on pid file %s", filename);
-         }
-     }
- }
--
  /*
   * Set standard file descriptors to /dev/null
   */

diff --cc src/openvpn/mtcp.c
Simple merge

diff --cc src/openvpn/mudp.c
Simple merge

diff --cc src/openvpn/multi.c
Simple merge

diff --cc src/openvpn/openvpn.c
Simple merge

diff --cc src/openvpn/options.c
Simple merge

diff --cc src/openvpn/packet_id.c
Simple merge

diff --cc src/openvpn/platform.c
index 8db51537664daf43a303a72125f38d30716e3e82,e942ba94a74356a538c07b249ae7a60d35046654..b35ab11dd5167aa2ca30cd591cc211cc92b66073
--- 1/src/openvpn/platform.c
--- 2/src/openvpn/platform.c
+++ b/src/openvpn/platform.c
@@@ -188,10 -173,8 +188,10 @@@ platform_nice(int niceval
  
  /* Get current PID */
  unsigned int
- platform_getpid()
+ platform_getpid(void)
  {
 +    FUZZING_BLOCK;
 +
  #ifdef _WIN32
      return (unsigned int) GetCurrentProcessId();
  #else

diff --cc src/openvpn/ps.c
Simple merge

diff --cc src/openvpn/route.c
Simple merge

diff --cc src/openvpn/socket.c
Simple merge

diff --cc src/openvpn/ssl_openssl.c
Simple merge

diff --cc src/openvpn/status.c
Simple merge

diff --cc src/openvpn/tun.c
index f001de4ba63c722f9c58aabc71e0e59f50131bc8,3639718c9d6f74ecad807b1f0a60a7a983b35c2f..ec9d4ec626e4efbdc70f8be771df78add04ae755
--- 1/src/openvpn/tun.c
--- 2/src/openvpn/tun.c
+++ b/src/openvpn/tun.c
@@@ -1862,8 -1861,8 +1862,8 @@@ open_tun(const char *dev, const char *d
      /* Android 4.4 workaround */
      if (oldtunfd >=0 && android_method == ANDROID_OPEN_AFTER_CLOSE)
      {
 -        close(oldtunfd);
 +        platform_close(oldtunfd);
-         openvpn_sleep(2);
+         management_sleep(2);
      }
  
      if (oldtunfd >=0  && android_method == ANDROID_KEEP_OLD_TUN)
@@@ -3030,9 -3026,8 +3027,8 @@@ utun_open_helper(struct ctl_info ctlInf
  
      if (ioctl(fd, CTLIOCGINFO, &ctlInfo) == -1)
      {
 -        close(fd);
 +        platform_close(fd);
-         msg(M_INFO, "Opening utun (%s): %s", "ioctl(CTLIOCGINFO)",
-             strerror(errno));
+         msg(M_INFO | M_ERRNO, "Opening utun (ioctl(CTLIOCGINFO))");
          return -2;
      }
  
@@@ -3050,9 -3045,8 +3046,8 @@@
  
      if (connect(fd, (struct sockaddr *)&sc, sizeof(sc)) < 0)
      {
-         msg(M_INFO, "Opening utun (%s): %s", "connect(AF_SYS_CONTROL)",
-             strerror(errno));
+         msg(M_INFO | M_ERRNO, "Opening utun (connect(AF_SYS_CONTROL))");
 -        close(fd);
 +        platform_close(fd);
          return -1;
      }