diff -ruN pichi.orig/Makefile pichi/Makefile
--- pichi.orig/Makefile	1970-01-01 00:00:00.000000000 +0000
+++ pichi/Makefile	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +1,7 @@
 # $FreeBSD: head/net/pichi/Makefile 540491 2020-06-26 11:15:18Z fernape $
 
 PORTNAME=	pichi
-DISTVERSION=	1.3.0
+DISTVERSION=	1.3.1
 CATEGORIES=	net
 
 MAINTAINER=	pichi@elude.in
diff -ruN pichi.orig/distinfo pichi/distinfo
--- pichi.orig/distinfo	1970-01-01 00:00:00.000000000 +0000
+++ pichi/distinfo	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +1,2 @@
-TIMESTAMP = 1554899633
-SHA256 (pichi-router-pichi-1.3.0_GH0.tar.gz) = f5686a1e7c98d9c9eca88d88af53b85648ceeff9aa33bf2b1d95a09462d74d1c
-SIZE (pichi-router-pichi-1.3.0_GH0.tar.gz) = 2066723
+SHA256 (pichi-router-pichi-1.3.1_GH0.tar.gz) = be1dc4d501387ef3524697ac804bec3ceb235a0c323ef8901532f04b0fab5cac
+SIZE (pichi-router-pichi-1.3.1_GH0.tar.gz) = 2068432
diff -ruN pichi.orig/files/patch-cmake_Configure.cmake pichi/files/patch-cmake_Configure.cmake
--- pichi.orig/files/patch-cmake_Configure.cmake	1970-01-01 00:00:00.000000000 +0000
+++ pichi/files/patch-cmake_Configure.cmake	1970-01-01 00:00:00.000000000 +0000
@@ -0,0 +1,26 @@
+--- cmake/Configure.cmake.orig	1970-01-01 00:00:00 UTC
++++ cmake/Configure.cmake
+@@ -104,6 +104,14 @@ else ()
+   set(DEPRECATED_RFC2818_CLASS OFF)
+ endif ()
+ 
++if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
++  CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "11.0.0")
++  # From clang 11.0.0, using std::allocator<void> triggers -Wdeprecated-declarations
++   set(DEPRECATED_ALLOCATOR_VOID ON)
++else ()
++  set(DEPRECATED_ALLOCATOR_VOID OFF)
++endif ()
++
+ # TODO check_cxx_compiler_flag command always gets failed when generating for iOS
+ if (IOS)
+   set(DISABLE_SHORTEN_64_TO_32_WARNING ON)
+@@ -125,6 +133,7 @@ if (BUILD_SERVER)
+   check_function_exists("close" HAS_CLOSE)
+ endif ()
+ 
+-configure_file(${CMAKE_SOURCE_DIR}/include/pichi/config.hpp.in ${CMAKE_BINARY_DIR}/include/pichi/config.hpp)
++configure_file(${CMAKE_SOURCE_DIR}/include/pichi/config.hpp.in
++  ${CMAKE_BINARY_DIR}/include/pichi/config.hpp)
+ 
+ message(STATUS "Generating config.hpp - done")
diff -ruN pichi.orig/files/patch-include_pichi_config.hpp.in pichi/files/patch-include_pichi_config.hpp.in
--- pichi.orig/files/patch-include_pichi_config.hpp.in	1970-01-01 00:00:00.000000000 +0000
+++ pichi/files/patch-include_pichi_config.hpp.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +1,63 @@
---- include/pichi/config.hpp.in.orig	1970-01-01 00:00:00 UTC
+--- include/pichi/config.hpp.in.orig	1970-01-01 00:00:00 UTC
 +++ include/pichi/config.hpp.in
-@@ -42,6 +42,15 @@
+@@ -25,7 +25,7 @@
+ #pragma clang diagnostic ignored "-Wreturn-std-move"
+ #include <boost/asio/ip/basic_resolver.hpp>
+ #pragma clang diagnostic pop
+-#endif // NO_RETURN_STD_MOVE_FOR_BOOST_ASIO && __clang__
++#endif  // NO_RETURN_STD_MOVE_FOR_BOOST_ASIO && __clang__
+ 
+ #cmakedefine DISABLE_SHORTEN_64_TO_32_WARNING
+ #if defined(DISABLE_SHORTEN_64_TO_32_WARNING) && defined(__clang__)
+@@ -33,7 +33,7 @@
+ #pragma clang diagnostic ignored "-Wshorten-64-to-32"
+ #include <boost/asio/basic_socket.hpp>
+ #pragma clang diagnostic pop
+-#endif // NO_RETURN_STD_MOVE_FOR_BOOST_ASIO && __clang__
++#endif  // NO_RETURN_STD_MOVE_FOR_BOOST_ASIO && __clang__
+ 
+ #cmakedefine DISABLE_C4702_FOR_BEAST_FIELDS
+ #if defined(DISABLE_C4702_FOR_BEAST_FIELDS) && defined(_MSC_VER)
+@@ -41,7 +41,7 @@
+ #pragma warning(disable : 4702)
+ #include <boost/beast/http/fields.hpp>
  #pragma warning(pop)
- #endif // DISABLE_C4702_FOR_BEAST_FIELDS && _MSC_VER
+-#endif // DISABLE_C4702_FOR_BEAST_FIELDS && _MSC_VER
++#endif  // DISABLE_C4702_FOR_BEAST_FIELDS && _MSC_VER
  
-+#ifdef __clang__
-+#if !__has_feature(c_atomic)
+ #ifdef __clang__
+ #if !__has_feature(c_atomic)
+@@ -49,18 +49,28 @@
+ #pragma clang diagnostic ignored "-Wc11-extensions"
+ #include <boost/smart_ptr/detail/sp_counted_base_clang.hpp>
+ #pragma clang diagnostic pop
+-#endif // !__has_feature(c_atomic)
+-#endif // __clang__
++#endif  // !__has_feature(c_atomic)
++#endif  // __clang__
+ 
++#cmakedefine DEPRECATED_ALLOCATOR_VOID
++#if defined(DEPRECATED_ALLOCATOR_VOID) && defined(__clang__)
 +#pragma clang diagnostic push
-+#pragma clang diagnostic ignored "-Wc11-extensions"
-+#include <boost/smart_ptr/detail/sp_counted_base_clang.hpp>
++#pragma clang diagnostic ignored "-Wdeprecated-declarations"
++#include <boost/asio/associated_allocator.hpp>
++#include <boost/asio/impl/executor.hpp>
++#include <boost/beast/core/async_base.hpp>
 +#pragma clang diagnostic pop
-+#endif // !__has_feature(c_atomic)
-+#endif // __clang__
++#endif  // DEPRECATED_ALLOCATOR_VOID && __clang__
 +
  #cmakedefine CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
  
  #ifdef CMAKE_INSTALL_PREFIX
+ #define PICHI_PREFIX CMAKE_INSTALL_PREFIX
+-#else // CMAKE_INSTALL_PREFIX
++#else  // CMAKE_INSTALL_PREFIX
+ #error "CMAKE_INSTALL_PREFIX not defined"
+-#endif // CMAKE_INSTALL_PREFIX
++#endif  // CMAKE_INSTALL_PREFIX
+ 
+ #cmakedefine ENABLE_TLS
+ #cmakedefine BUILD_TEST
+ 
+-#endif // PICHI_CONFIG_H
++#endif  // PICHI_CONFIG_H
diff -ruN pichi.orig/files/patch-server_main.cpp pichi/files/patch-server_main.cpp
--- pichi.orig/files/patch-server_main.cpp	1970-01-01 00:00:00.000000000 +0000
+++ pichi/files/patch-server_main.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
---- server/main.cpp.orig	1970-01-01 00:00:00 UTC
-+++ server/main.cpp
-@@ -1,10 +1,11 @@
-+#include <pichi/config.hpp>
-+// Include config.hpp first
- #include <boost/filesystem/operations.hpp>
- #include <boost/filesystem/path.hpp>
- #include <boost/program_options.hpp>
- #include <fstream>
- #include <iostream>
- #include <memory>
--#include <pichi/config.hpp>
- #include <stdio.h>
- #ifdef HAS_UNISTD_H
- #include <errno.h>
diff -ruN pichi.orig/files/patch-src_api_egress__manager.cpp pichi/files/patch-src_api_egress__manager.cpp
--- pichi.orig/files/patch-src_api_egress__manager.cpp	1970-01-01 00:00:00.000000000 +0000
+++ pichi/files/patch-src_api_egress__manager.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -0,0 +1,26 @@
+--- src/api/egress_manager.cpp.orig	1970-01-01 00:00:00 UTC
++++ src/api/egress_manager.cpp
+@@ -1,5 +1,6 @@
+-#include <pichi/api/egress_manager.hpp>
+ #include <pichi/config.hpp>
++// Include config.hpp first
++#include <pichi/api/egress_manager.hpp>
+ 
+ using namespace std;
+ 
+@@ -9,7 +10,7 @@ void EgressManager::update(string const& name, EgressV
+ {
+ #ifndef ENABLE_TLS
+   assertFalse(vo.tls_.has_value() && *vo.tls_, PichiError::SEMANTIC_ERROR, "TLS not supported");
+-#endif // ENABLE_TLS
++#endif  // ENABLE_TLS
+   c_[name] = move(vo);
+ }
+ 
+@@ -25,4 +26,4 @@ EgressManager::ConstIterator EgressManager::end() cons
+ 
+ EgressManager::ConstIterator EgressManager::find(string_view name) const { return c_.find(name); }
+ 
+-} // namespace pichi::api
+\ No newline at end of file
++}  // namespace pichi::api
diff -ruN pichi.orig/files/patch-src_api_vos.cpp pichi/files/patch-src_api_vos.cpp
--- pichi.orig/files/patch-src_api_vos.cpp	1970-01-01 00:00:00.000000000 +0000
+++ pichi/files/patch-src_api_vos.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -0,0 +1,65 @@
+--- src/api/vos.cpp.orig	1970-01-01 00:00:00 UTC
++++ src/api/vos.cpp
+@@ -1,3 +1,5 @@
++#include <pichi/config.hpp>
++// Include config.hpp first
+ #include <numeric>
+ #include <pichi/api/vos.hpp>
+ #include <pichi/common.hpp>
+@@ -57,7 +59,7 @@ static decltype(auto) keyFile_ = "key_file";
+ static decltype(auto) destinations_ = "destinations";
+ static decltype(auto) balance_ = "balance";
+ 
+-} // namespace IngressVOKey
++}  // namespace IngressVOKey
+ 
+ namespace EgressVOKey {
+ 
+@@ -73,7 +75,7 @@ static decltype(auto) tls_ = "tls";
+ static decltype(auto) insecure_ = "insecure";
+ static decltype(auto) caFile_ = "ca_file";
+ 
+-} // namespace EgressVOKey
++}  // namespace EgressVOKey
+ 
+ namespace RuleVOKey {
+ 
+@@ -84,20 +86,20 @@ static decltype(auto) pattern_ = "pattern";
+ static decltype(auto) domain_ = "domain";
+ static decltype(auto) country_ = "country";
+ 
+-} // namespace RuleVOKey
++}  // namespace RuleVOKey
+ 
+ namespace RouteVOKey {
+ 
+ static decltype(auto) default_ = "default";
+ static decltype(auto) rules_ = "rules";
+ 
+-} // namespace RouteVOKey
++}  // namespace RouteVOKey
+ 
+ namespace ErrorVOKey {
+ 
+ static decltype(auto) message_ = "message";
+ 
+-} // namespace ErrorVOKey
++}  // namespace ErrorVOKey
+ 
+ namespace msg {
+ 
+@@ -129,7 +131,7 @@ static auto const TOO_LONG_NAME_PASSWORD = "Name or pa
+ static auto const MISSING_DESTINATIONS_FIELD = "Missiong destinations field"sv;
+ static auto const MISSING_BALANCE_FIELD = "Missiong balance field"sv;
+ 
+-} // namespace msg
++}  // namespace msg
+ 
+ static DelayMode parseDelayMode(json::Value const& v)
+ {
+@@ -683,4 +685,4 @@ template <> RouteVO parse(json::Value const& v)
+   return rvo;
+ }
+ 
+-} // namespace pichi::api
++}  // namespace pichi::api
diff -ruN pichi.orig/files/patch-src_net_spawn.cpp pichi/files/patch-src_net_spawn.cpp
--- pichi.orig/files/patch-src_net_spawn.cpp	1970-01-01 00:00:00.000000000 +0000
+++ pichi/files/patch-src_net_spawn.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -0,0 +1,14 @@
+--- src/net/spawn.cpp.orig	1970-01-01 00:00:00 UTC
++++ src/net/spawn.cpp
+@@ -1,3 +1,5 @@
++#include <pichi/config.hpp>
++// Include config.hpp first
+ #include <boost/beast/http/error.hpp>
+ #include <iostream>
+ #include <pichi/exception.hpp>
+@@ -28,4 +30,4 @@ void logException(std::exception_ptr eptr) noexcept
+ 
+ void stubHandler(std::exception_ptr, asio::yield_context) noexcept {}
+ 
+-} // namespace pichi::net
++}  // namespace pichi::net
diff -ruN pichi.orig/files/patch-test_endpoint.cpp pichi/files/patch-test_endpoint.cpp
--- pichi.orig/files/patch-test_endpoint.cpp	1970-01-01 00:00:00.000000000 +0000
+++ pichi/files/patch-test_endpoint.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
---- test/endpoint.cpp.orig	1970-01-01 00:00:00 UTC
-+++ test/endpoint.cpp
-@@ -132,7 +132,8 @@ BOOST_AUTO_TEST_CASE(serialize_Domain)
- #ifndef HAS_CLASS_TEMPLATE_ARGUMENT_DEDUCTION
-       <uint8_t, 13>
- #endif // HAS_CLASS_TEMPLATE_ARGUMENT_DEDUCTION
--      {0x03, 0x09, 'l', 'o', 'c', 'a', 'l', 'h', 'o', 's', 't', 0x01, 0xbb};
-+      {0x03_u8, 0x09_u8, 0x6c_u8, 0x6f_u8, 0x63_u8, 0x61_u8, 0x6c_u8,
-+       0x68_u8, 0x6f_u8, 0x73_u8, 0x74_u8, 0x01_u8, 0xbb_u8};
- 
-   auto fact = array<uint8_t, 13>{};
-   auto len = serializeEndpoint(makeEndpoint(host, port), fact);
diff -ruN pichi.orig/files/patch-test_method.cpp pichi/files/patch-test_method.cpp
--- pichi.orig/files/patch-test_method.cpp	1970-01-01 00:00:00.000000000 +0000
+++ pichi/files/patch-test_method.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
---- test/method.cpp.orig	1970-01-01 00:00:00 UTC
-+++ test/method.cpp
-@@ -1,5 +1,6 @@
- #define BOOST_TEST_MODULE pichi method test
- 
-+#include "utils.hpp"
- #include <boost/test/unit_test.hpp>
- #include <pichi/common.hpp>
- #include <pichi/crypto/method.hpp>
diff -ruN pichi.orig/files/patch-test_utils.hpp pichi/files/patch-test_utils.hpp
--- pichi.orig/files/patch-test_utils.hpp	1970-01-01 00:00:00.000000000 +0000
+++ pichi/files/patch-test_utils.hpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- test/utils.hpp.orig	1970-01-01 00:00:00 UTC
-+++ test/utils.hpp
-@@ -1,6 +1,8 @@
- #ifndef PICHI_TEST_UTILS_HPP
- #define PICHI_TEST_UTILS_HPP
- 
-+#include <pichi/config.hpp>
-+// Include config.hpp first
- #include <boost/asio/error.hpp>
- #include <boost/beast/http/error.hpp>
- #include <pichi/api/vos.hpp>
diff -ruN pichi.orig/pkg-plist pichi/pkg-plist
--- pichi.orig/pkg-plist	1970-01-01 00:00:00.000000000 +0000
+++ pichi/pkg-plist	1970-01-01 00:00:00.000000000 +0000
@@ -37,7 +37,7 @@
 %%DEVEL%%include/pichi/net/spawn.hpp
 %%DEVEL%%include/pichi/net/ssaead.hpp
 %%DEVEL%%include/pichi/net/ssstream.hpp
+%%DEVEL%%include/pichi/net/stream.hpp
 %%DEVEL%%include/pichi/net/tunnel.hpp
-%%DEVEL%%include/pichi/test/socket.hpp
 %%DEVEL%%include/pichi/uri.hpp
 %%DEVEL%%include/pichi.h