asio version 1.12.2 released
diff --git a/asio/README b/asio/README
index 7e4f25c..cb5ab7f 100644
--- a/asio/README
+++ b/asio/README
@@ -1,4 +1,4 @@
-asio version 1.12.1
-Released Sunday, 15 April 2018.
+asio version 1.12.2
+Released Sunday, 09 December 2018.
 
 See doc/index.html for API documentation and a tutorial.
diff --git a/asio/asio.manifest b/asio/asio.manifest
index 08fcfe9..25b1497 100644
--- a/asio/asio.manifest
+++ b/asio/asio.manifest
@@ -102,21 +102,7 @@
 /doc/asio/reference/async_connect/overload4.html
 /doc/asio/reference/async_connect/overload5.html
 /doc/asio/reference/async_connect/overload6.html
-/doc/asio/reference/asynchronous_operations/
-/doc/asio/reference/asynchronous_operations/allocation_of_intermediate_storage.html
-/doc/asio/reference/asynchronous_operations/associated_executor.html
-/doc/asio/reference/asynchronous_operations/automatic_deduction_of_initiating_function_return_type.html
-/doc/asio/reference/asynchronous_operations/completion_handler_executor.html
-/doc/asio/reference/asynchronous_operations/completion_handlers_and_exceptions.html
-/doc/asio/reference/asynchronous_operations/completion_token.html
-/doc/asio/reference/asynchronous_operations/execution_of_completion_handler_on_completion_of_asynchronous_operation.html
-/doc/asio/reference/asynchronous_operations/general_asynchronous_operation_concepts.html
 /doc/asio/reference/asynchronous_operations.html
-/doc/asio/reference/asynchronous_operations/i_o_executor.html
-/doc/asio/reference/asynchronous_operations/lifetime_of_initiating_function_arguments.html
-/doc/asio/reference/asynchronous_operations/non_blocking_requirements_on_initiating_functions.html
-/doc/asio/reference/asynchronous_operations/outstanding_work.html
-/doc/asio/reference/asynchronous_operations/production_of_initiating_function_return_value.html
 /doc/asio/reference/asynchronous_socket_operations.html
 /doc/asio/reference/AsyncRandomAccessReadDevice.html
 /doc/asio/reference/AsyncRandomAccessWriteDevice.html
@@ -1578,8 +1564,8 @@
 /doc/asio/reference/dispatch/overload2.html
 /doc/asio/reference/dispatch/overload3.html
 /doc/asio/reference/dynamic_buffer/
-/doc/asio/reference/dynamic_buffer.html
 /doc/asio/reference/DynamicBuffer.html
+/doc/asio/reference/dynamic_buffer.html
 /doc/asio/reference/dynamic_buffer/overload1.html
 /doc/asio/reference/dynamic_buffer/overload2.html
 /doc/asio/reference/dynamic_buffer/overload3.html
@@ -1671,8 +1657,8 @@
 /doc/asio/reference/execution_context/execution_context.html
 /doc/asio/reference/execution_context/fork_event.html
 /doc/asio/reference/execution_context/has_service.html
-/doc/asio/reference/execution_context.html
 /doc/asio/reference/ExecutionContext.html
+/doc/asio/reference/execution_context.html
 /doc/asio/reference/execution_context__id/
 /doc/asio/reference/execution_context__id.html
 /doc/asio/reference/execution_context__id/id.html
@@ -2345,8 +2331,8 @@
 /doc/asio/reference/ip__basic_resolver_iterator/dereference.html
 /doc/asio/reference/ip__basic_resolver_iterator/difference_type.html
 /doc/asio/reference/ip__basic_resolver_iterator/equal.html
-/doc/asio/reference/ip__basic_resolver_iterator.html
 /doc/asio/reference/ip__basic_resolver/iterator.html
+/doc/asio/reference/ip__basic_resolver_iterator.html
 /doc/asio/reference/ip__basic_resolver_iterator/increment.html
 /doc/asio/reference/ip__basic_resolver_iterator/index_.html
 /doc/asio/reference/ip__basic_resolver_iterator/iterator_category.html
@@ -2384,8 +2370,8 @@
 /doc/asio/reference/ip__basic_resolver_query/flags.html
 /doc/asio/reference/ip__basic_resolver_query/hints.html
 /doc/asio/reference/ip__basic_resolver_query/host_name.html
-/doc/asio/reference/ip__basic_resolver_query.html
 /doc/asio/reference/ip__basic_resolver/query.html
+/doc/asio/reference/ip__basic_resolver_query.html
 /doc/asio/reference/ip__basic_resolver_query/numeric_host.html
 /doc/asio/reference/ip__basic_resolver_query/numeric_service.html
 /doc/asio/reference/ip__basic_resolver_query/passive.html
@@ -3079,6 +3065,7 @@
 /doc/asio/reference/ssl__context_base/no_sslv3.html
 /doc/asio/reference/ssl__context_base/no_tlsv1_1.html
 /doc/asio/reference/ssl__context_base/no_tlsv1_2.html
+/doc/asio/reference/ssl__context_base/no_tlsv1_3.html
 /doc/asio/reference/ssl__context_base/no_tlsv1.html
 /doc/asio/reference/ssl__context_base/options.html
 /doc/asio/reference/ssl__context_base/password_purpose.html
@@ -3107,6 +3094,7 @@
 /doc/asio/reference/ssl__context/no_sslv3.html
 /doc/asio/reference/ssl__context/no_tlsv1_1.html
 /doc/asio/reference/ssl__context/no_tlsv1_2.html
+/doc/asio/reference/ssl__context/no_tlsv1_3.html
 /doc/asio/reference/ssl__context/no_tlsv1.html
 /doc/asio/reference/ssl__context/operator_eq_.html
 /doc/asio/reference/ssl__context/options.html
@@ -3406,8 +3394,8 @@
 /doc/asio/reference/uses_executor.html
 /doc/asio/reference/WaitHandler.html
 /doc/asio/reference/wait_traits/
-/doc/asio/reference/wait_traits.html
 /doc/asio/reference/WaitTraits.html
+/doc/asio/reference/wait_traits.html
 /doc/asio/reference/wait_traits/to_wait_duration/
 /doc/asio/reference/wait_traits/to_wait_duration.html
 /doc/asio/reference/wait_traits/to_wait_duration/overload1.html
@@ -3705,10 +3693,6 @@
 /doc/examples/diffs/http/server/request_parser.hpp.html
 /doc/examples/diffs/http/server/server.cpp.html
 /doc/examples/diffs/http/server/server.hpp.html
-/doc/examples/diffs/icmp/
-/doc/examples/diffs/icmp/icmp_header.hpp.html
-/doc/examples/diffs/icmp/ipv4_header.hpp.html
-/doc/examples/diffs/icmp/ping.cpp.html
 /doc/examples/diffs/invocation/
 /doc/examples/diffs/invocation/prioritised_handlers.cpp.html
 /doc/examples/diffs/iostreams/
@@ -3723,9 +3707,29 @@
 /doc/examples/diffs/multicast/sender.cpp.html
 /doc/examples/diffs/nonblocking/
 /doc/examples/diffs/nonblocking/third_party_lib.cpp.html
+/doc/examples/diffs/operations/
+/doc/examples/diffs/operations/composed_1.cpp.html
+/doc/examples/diffs/operations/composed_2.cpp.html
+/doc/examples/diffs/operations/composed_3.cpp.html
+/doc/examples/diffs/operations/composed_4.cpp.html
+/doc/examples/diffs/operations/composed_5.cpp.html
+/doc/examples/diffs/socks4/
+/doc/examples/diffs/socks4/socks4.hpp.html
+/doc/examples/diffs/socks4/sync_client.cpp.html
 /doc/examples/diffs/spawn/
 /doc/examples/diffs/spawn/echo_server.cpp.html
 /doc/examples/diffs/spawn/parallel_grep.cpp.html
+/doc/examples/diffs/ssl/
+/doc/examples/diffs/ssl/client.cpp.html
+/doc/examples/diffs/ssl/server.cpp.html
+/doc/examples/diffs/timeouts/
+/doc/examples/diffs/timeouts/async_tcp_client.cpp.html
+/doc/examples/diffs/timeouts/blocking_tcp_client.cpp.html
+/doc/examples/diffs/timeouts/blocking_token_tcp_client.cpp.html
+/doc/examples/diffs/timeouts/blocking_udp_client.cpp.html
+/doc/examples/diffs/timeouts/server.cpp.html
+/doc/examples/diffs/timers/
+/doc/examples/diffs/timers/time_t_timer.cpp.html
 /doc/home.png
 /doc/important.png
 /doc/index.html
@@ -3812,6 +3816,7 @@
 /include/asio/detail/fd_set_adapter.hpp
 /include/asio/detail/fenced_block.hpp
 /include/asio/detail/functional.hpp
+/include/asio/detail/future.hpp
 /include/asio/detail/gcc_arm_fenced_block.hpp
 /include/asio/detail/gcc_hppa_fenced_block.hpp
 /include/asio/detail/gcc_sync_fenced_block.hpp
@@ -4499,9 +4504,29 @@
 /src/examples/cpp11/multicast/sender.cpp
 /src/examples/cpp11/nonblocking/
 /src/examples/cpp11/nonblocking/third_party_lib.cpp
+/src/examples/cpp11/operations/
+/src/examples/cpp11/operations/composed_1.cpp
+/src/examples/cpp11/operations/composed_2.cpp
+/src/examples/cpp11/operations/composed_3.cpp
+/src/examples/cpp11/operations/composed_4.cpp
+/src/examples/cpp11/operations/composed_5.cpp
+/src/examples/cpp11/socks4/
+/src/examples/cpp11/socks4/socks4.hpp
+/src/examples/cpp11/socks4/sync_client.cpp
 /src/examples/cpp11/spawn/
 /src/examples/cpp11/spawn/echo_server.cpp
 /src/examples/cpp11/spawn/parallel_grep.cpp
+/src/examples/cpp11/ssl/
+/src/examples/cpp11/ssl/client.cpp
+/src/examples/cpp11/ssl/server.cpp
+/src/examples/cpp11/timeouts/
+/src/examples/cpp11/timeouts/async_tcp_client.cpp
+/src/examples/cpp11/timeouts/blocking_tcp_client.cpp
+/src/examples/cpp11/timeouts/blocking_token_tcp_client.cpp
+/src/examples/cpp11/timeouts/blocking_udp_client.cpp
+/src/examples/cpp11/timeouts/server.cpp
+/src/examples/cpp11/timers/
+/src/examples/cpp11/timers/time_t_timer.cpp
 /src/examples/cpp14/
 /src/examples/cpp14/echo/
 /src/examples/cpp14/echo/async_tcp_echo_server.cpp
diff --git a/asio/boost_asio.manifest b/asio/boost_asio.manifest
index 43664df..e9b7cd2 100644
--- a/asio/boost_asio.manifest
+++ b/asio/boost_asio.manifest
@@ -70,6 +70,7 @@
 /boost/asio/detail/fd_set_adapter.hpp
 /boost/asio/detail/fenced_block.hpp
 /boost/asio/detail/functional.hpp
+/boost/asio/detail/future.hpp
 /boost/asio/detail/gcc_arm_fenced_block.hpp
 /boost/asio/detail/gcc_hppa_fenced_block.hpp
 /boost/asio/detail/gcc_sync_fenced_block.hpp
@@ -508,8 +509,11 @@
 /boost/system/config.hpp
 /boost/system/cygwin_error.hpp
 /boost/system/detail/
-/boost/system/detail/error_code.ipp
-/boost/system/detail/local_free_on_destruction.hpp
+/boost/system/detail/config.hpp
+/boost/system/detail/generic_category.hpp
+/boost/system/detail/std_interoperability.hpp
+/boost/system/detail/system_category_posix.hpp
+/boost/system/detail/system_category_win32.hpp
 /boost/system/error_code.hpp
 /boost/system/linux_error.hpp
 /boost/system/system_error.hpp
@@ -724,9 +728,29 @@
 /doc/html/boost_asio/example/cpp11/multicast/
 /doc/html/boost_asio/example/cpp11/multicast/receiver.cpp
 /doc/html/boost_asio/example/cpp11/multicast/sender.cpp
+/doc/html/boost_asio/example/cpp11/operations/
+/doc/html/boost_asio/example/cpp11/operations/composed_1.cpp
+/doc/html/boost_asio/example/cpp11/operations/composed_2.cpp
+/doc/html/boost_asio/example/cpp11/operations/composed_3.cpp
+/doc/html/boost_asio/example/cpp11/operations/composed_4.cpp
+/doc/html/boost_asio/example/cpp11/operations/composed_5.cpp
+/doc/html/boost_asio/example/cpp11/socks4/
+/doc/html/boost_asio/example/cpp11/socks4/socks4.hpp
+/doc/html/boost_asio/example/cpp11/socks4/sync_client.cpp
 /doc/html/boost_asio/example/cpp11/spawn/
 /doc/html/boost_asio/example/cpp11/spawn/echo_server.cpp
 /doc/html/boost_asio/example/cpp11/spawn/parallel_grep.cpp
+/doc/html/boost_asio/example/cpp11/ssl/
+/doc/html/boost_asio/example/cpp11/ssl/client.cpp
+/doc/html/boost_asio/example/cpp11/ssl/server.cpp
+/doc/html/boost_asio/example/cpp11/timeouts/
+/doc/html/boost_asio/example/cpp11/timeouts/async_tcp_client.cpp
+/doc/html/boost_asio/example/cpp11/timeouts/blocking_tcp_client.cpp
+/doc/html/boost_asio/example/cpp11/timeouts/blocking_token_tcp_client.cpp
+/doc/html/boost_asio/example/cpp11/timeouts/blocking_udp_client.cpp
+/doc/html/boost_asio/example/cpp11/timeouts/server.cpp
+/doc/html/boost_asio/example/cpp11/timers/
+/doc/html/boost_asio/example/cpp11/timers/time_t_timer.cpp
 /doc/html/boost_asio/example/cpp17/
 /doc/html/boost_asio/example/cpp17/coroutines_ts/
 /doc/html/boost_asio/example/cpp17/coroutines_ts/chat_server.cpp
@@ -827,21 +851,7 @@
 /doc/html/boost_asio/reference/async_connect/overload4.html
 /doc/html/boost_asio/reference/async_connect/overload5.html
 /doc/html/boost_asio/reference/async_connect/overload6.html
-/doc/html/boost_asio/reference/asynchronous_operations/
-/doc/html/boost_asio/reference/asynchronous_operations/allocation_of_intermediate_storage.html
-/doc/html/boost_asio/reference/asynchronous_operations/associated_executor.html
-/doc/html/boost_asio/reference/asynchronous_operations/automatic_deduction_of_initiating_function_return_type.html
-/doc/html/boost_asio/reference/asynchronous_operations/completion_handler_executor.html
-/doc/html/boost_asio/reference/asynchronous_operations/completion_handlers_and_exceptions.html
-/doc/html/boost_asio/reference/asynchronous_operations/completion_token.html
-/doc/html/boost_asio/reference/asynchronous_operations/execution_of_completion_handler_on_completion_of_asynchronous_operation.html
-/doc/html/boost_asio/reference/asynchronous_operations/general_asynchronous_operation_concepts.html
 /doc/html/boost_asio/reference/asynchronous_operations.html
-/doc/html/boost_asio/reference/asynchronous_operations/i_o_executor.html
-/doc/html/boost_asio/reference/asynchronous_operations/lifetime_of_initiating_function_arguments.html
-/doc/html/boost_asio/reference/asynchronous_operations/non_blocking_requirements_on_initiating_functions.html
-/doc/html/boost_asio/reference/asynchronous_operations/outstanding_work.html
-/doc/html/boost_asio/reference/asynchronous_operations/production_of_initiating_function_return_value.html
 /doc/html/boost_asio/reference/asynchronous_socket_operations.html
 /doc/html/boost_asio/reference/AsyncRandomAccessReadDevice.html
 /doc/html/boost_asio/reference/AsyncRandomAccessWriteDevice.html
@@ -2303,8 +2313,8 @@
 /doc/html/boost_asio/reference/dispatch/overload2.html
 /doc/html/boost_asio/reference/dispatch/overload3.html
 /doc/html/boost_asio/reference/dynamic_buffer/
-/doc/html/boost_asio/reference/dynamic_buffer.html
 /doc/html/boost_asio/reference/DynamicBuffer.html
+/doc/html/boost_asio/reference/dynamic_buffer.html
 /doc/html/boost_asio/reference/dynamic_buffer/overload1.html
 /doc/html/boost_asio/reference/dynamic_buffer/overload2.html
 /doc/html/boost_asio/reference/dynamic_buffer/overload3.html
@@ -2370,8 +2380,8 @@
 /doc/html/boost_asio/reference/execution_context/execution_context.html
 /doc/html/boost_asio/reference/execution_context/fork_event.html
 /doc/html/boost_asio/reference/execution_context/has_service.html
-/doc/html/boost_asio/reference/execution_context.html
 /doc/html/boost_asio/reference/ExecutionContext.html
+/doc/html/boost_asio/reference/execution_context.html
 /doc/html/boost_asio/reference/execution_context__id/
 /doc/html/boost_asio/reference/execution_context__id.html
 /doc/html/boost_asio/reference/execution_context__id/id.html
@@ -3044,8 +3054,8 @@
 /doc/html/boost_asio/reference/ip__basic_resolver_iterator/dereference.html
 /doc/html/boost_asio/reference/ip__basic_resolver_iterator/difference_type.html
 /doc/html/boost_asio/reference/ip__basic_resolver_iterator/equal.html
-/doc/html/boost_asio/reference/ip__basic_resolver_iterator.html
 /doc/html/boost_asio/reference/ip__basic_resolver/iterator.html
+/doc/html/boost_asio/reference/ip__basic_resolver_iterator.html
 /doc/html/boost_asio/reference/ip__basic_resolver_iterator/increment.html
 /doc/html/boost_asio/reference/ip__basic_resolver_iterator/index_.html
 /doc/html/boost_asio/reference/ip__basic_resolver_iterator/iterator_category.html
@@ -3083,8 +3093,8 @@
 /doc/html/boost_asio/reference/ip__basic_resolver_query/flags.html
 /doc/html/boost_asio/reference/ip__basic_resolver_query/hints.html
 /doc/html/boost_asio/reference/ip__basic_resolver_query/host_name.html
-/doc/html/boost_asio/reference/ip__basic_resolver_query.html
 /doc/html/boost_asio/reference/ip__basic_resolver/query.html
+/doc/html/boost_asio/reference/ip__basic_resolver_query.html
 /doc/html/boost_asio/reference/ip__basic_resolver_query/numeric_host.html
 /doc/html/boost_asio/reference/ip__basic_resolver_query/numeric_service.html
 /doc/html/boost_asio/reference/ip__basic_resolver_query/passive.html
@@ -3795,6 +3805,7 @@
 /doc/html/boost_asio/reference/ssl__context_base/no_sslv3.html
 /doc/html/boost_asio/reference/ssl__context_base/no_tlsv1_1.html
 /doc/html/boost_asio/reference/ssl__context_base/no_tlsv1_2.html
+/doc/html/boost_asio/reference/ssl__context_base/no_tlsv1_3.html
 /doc/html/boost_asio/reference/ssl__context_base/no_tlsv1.html
 /doc/html/boost_asio/reference/ssl__context_base/options.html
 /doc/html/boost_asio/reference/ssl__context_base/password_purpose.html
@@ -3823,6 +3834,7 @@
 /doc/html/boost_asio/reference/ssl__context/no_sslv3.html
 /doc/html/boost_asio/reference/ssl__context/no_tlsv1_1.html
 /doc/html/boost_asio/reference/ssl__context/no_tlsv1_2.html
+/doc/html/boost_asio/reference/ssl__context/no_tlsv1_3.html
 /doc/html/boost_asio/reference/ssl__context/no_tlsv1.html
 /doc/html/boost_asio/reference/ssl__context/operator_eq_.html
 /doc/html/boost_asio/reference/ssl__context/options.html
@@ -4105,8 +4117,8 @@
 /doc/html/boost_asio/reference/uses_executor.html
 /doc/html/boost_asio/reference/WaitHandler.html
 /doc/html/boost_asio/reference/wait_traits/
-/doc/html/boost_asio/reference/wait_traits.html
 /doc/html/boost_asio/reference/WaitTraits.html
+/doc/html/boost_asio/reference/wait_traits.html
 /doc/html/boost_asio/reference/wait_traits/to_wait_duration/
 /doc/html/boost_asio/reference/wait_traits/to_wait_duration.html
 /doc/html/boost_asio/reference/wait_traits/to_wait_duration/overload1.html
@@ -4743,10 +4755,39 @@
 /libs/asio/example/cpp11/nonblocking/
 /libs/asio/example/cpp11/nonblocking/Jamfile.v2
 /libs/asio/example/cpp11/nonblocking/third_party_lib.cpp
+/libs/asio/example/cpp11/operations/
+/libs/asio/example/cpp11/operations/composed_1.cpp
+/libs/asio/example/cpp11/operations/composed_2.cpp
+/libs/asio/example/cpp11/operations/composed_3.cpp
+/libs/asio/example/cpp11/operations/composed_4.cpp
+/libs/asio/example/cpp11/operations/composed_5.cpp
+/libs/asio/example/cpp11/operations/Jamfile.v2
+/libs/asio/example/cpp11/socks4/
+/libs/asio/example/cpp11/socks4/Jamfile.v2
+/libs/asio/example/cpp11/socks4/socks4.hpp
+/libs/asio/example/cpp11/socks4/sync_client.cpp
 /libs/asio/example/cpp11/spawn/
 /libs/asio/example/cpp11/spawn/echo_server.cpp
 /libs/asio/example/cpp11/spawn/Jamfile.v2
 /libs/asio/example/cpp11/spawn/parallel_grep.cpp
+/libs/asio/example/cpp11/ssl/
+/libs/asio/example/cpp11/ssl/ca.pem
+/libs/asio/example/cpp11/ssl/client.cpp
+/libs/asio/example/cpp11/ssl/dh2048.pem
+/libs/asio/example/cpp11/ssl/Jamfile.v2
+/libs/asio/example/cpp11/ssl/README
+/libs/asio/example/cpp11/ssl/server.cpp
+/libs/asio/example/cpp11/ssl/server.pem
+/libs/asio/example/cpp11/timeouts/
+/libs/asio/example/cpp11/timeouts/async_tcp_client.cpp
+/libs/asio/example/cpp11/timeouts/blocking_tcp_client.cpp
+/libs/asio/example/cpp11/timeouts/blocking_token_tcp_client.cpp
+/libs/asio/example/cpp11/timeouts/blocking_udp_client.cpp
+/libs/asio/example/cpp11/timeouts/Jamfile.v2
+/libs/asio/example/cpp11/timeouts/server.cpp
+/libs/asio/example/cpp11/timers/
+/libs/asio/example/cpp11/timers/Jamfile.v2
+/libs/asio/example/cpp11/timers/time_t_timer.cpp
 /libs/asio/example/cpp17/
 /libs/asio/example/cpp17/coroutines_ts/
 /libs/asio/example/cpp17/coroutines_ts/chat_server.cpp
@@ -4920,19 +4961,34 @@
 /libs/system/build/Jamfile
 /libs/system/build/Jamfile.v2
 /libs/system/doc/
-/libs/system/doc/index.html
-/libs/system/doc/reference.html
+/libs/system/doc/Jamfile
+/libs/system/doc/system/
+/libs/system/doc/system/acknowledgements.adoc
+/libs/system/doc/system.adoc
+/libs/system/doc/system/changes.adoc
+/libs/system/doc/system/copyright.adoc
+/libs/system/doc/system-docinfo-footer.html
+/libs/system/doc/system/history.adoc
+/libs/system/doc/system/introduction.adoc
+/libs/system/doc/system/rationale.adoc
+/libs/system/doc/system/reference.adoc
 /libs/system/index.html
 /libs/system/meta/
 /libs/system/meta/libraries.json
 /libs/system/src/
 /libs/system/src/error_code.cpp
 /libs/system/test/
+/libs/system/test/after_main_test.cpp
 /libs/system/test/before_main_test.cpp
 /libs/system/test/config_test.cpp
+/libs/system/test/constexpr_test.cpp
 /libs/system/test/dynamic_link_test.cpp
+/libs/system/test/error_category_test.cpp
 /libs/system/test/error_code_test.cpp
 /libs/system/test/error_code_user_test.cpp
+/libs/system/test/failed_constexpr_test.cpp
+/libs/system/test/failed_test.cpp
+/libs/system/test/generic_category_test.cpp
 /libs/system/test/header_only_test.cpp
 /libs/system/test/initialization_test.cpp
 /libs/system/test/Jamfile.v2
@@ -4957,8 +5013,10 @@
 /libs/system/test/single_instance_test.cpp
 /libs/system/test/std_interop_test.cpp
 /libs/system/test/std_mismatch_test.cpp
+/libs/system/test/system_category_test.cpp
 /libs/system/test/system_error_test.cpp
 /libs/system/test/throws_assign_fail.cpp
 /libs/system/test/throw_test.cpp
+/libs/system/test/win32_hresult_test.cpp
 /libs/system/.travis.yml
 /README.txt
diff --git a/asio/configure.ac b/asio/configure.ac
index 4e886ba..d78c9d7 100644
--- a/asio/configure.ac
+++ b/asio/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(asio, [1.12.1])
+AC_INIT(asio, [1.12.2])
 AC_CONFIG_SRCDIR(include/asio.hpp)
 AM_MAINTAINER_MODE
 AM_INIT_AUTOMAKE([tar-ustar])
diff --git a/asio/include/asio/version.hpp b/asio/include/asio/version.hpp
index 099ffdb..82ceb16 100644
--- a/asio/include/asio/version.hpp
+++ b/asio/include/asio/version.hpp
@@ -18,6 +18,6 @@
 // ASIO_VERSION % 100 is the sub-minor version
 // ASIO_VERSION / 100 % 1000 is the minor version
 // ASIO_VERSION / 100000 is the major version
-#define ASIO_VERSION 101201 // 1.12.1
+#define ASIO_VERSION 101202 // 1.12.2
 
 #endif // ASIO_VERSION_HPP