6 files changed, 25 insertions, 6 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de54cddd..b659e7a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,28 @@
 
 
+## v0.2.2
+
+### Merged PRs:
+
+- [#872](https://github.com/TokTok/c-toxcore/issues/872) Restrict packet kinds that can be sent through onion path.
+- [#864](https://github.com/TokTok/c-toxcore/issues/864) CMake warn if libconfig not found
+- [#863](https://github.com/TokTok/c-toxcore/issues/863) Remove broken and unmaintained scripts.
+- [#859](https://github.com/TokTok/c-toxcore/issues/859) Add clarifying comment to cryptpacket_received function.
+- [#857](https://github.com/TokTok/c-toxcore/issues/857) Avoid the use of rand() in tests.
+- [#846](https://github.com/TokTok/c-toxcore/issues/846) Disallow stderr logger by default.
+- [#845](https://github.com/TokTok/c-toxcore/issues/845) Fix coveralls reporting.
+- [#844](https://github.com/TokTok/c-toxcore/issues/844) Add COVERAGE cmake flag for clang.
+- [#825](https://github.com/TokTok/c-toxcore/issues/825) Add default stderr logger for logging to nullptr.
+- [#824](https://github.com/TokTok/c-toxcore/issues/824) Simplify sendpacket function, deduplicate some logic.
+- [#809](https://github.com/TokTok/c-toxcore/issues/809) Remove the use of the 'hh' format specifier.
+- [#801](https://github.com/TokTok/c-toxcore/issues/801) Add logging to the onion_test.
+- [#797](https://github.com/TokTok/c-toxcore/issues/797) Move struct DHT_Friend into DHT.c.
+
 ## v0.2.1
 
 ### Merged PRs:
 
+- [#839](https://github.com/TokTok/c-toxcore/pull/839) Update changelog for 0.2.1
 - [#837](https://github.com/TokTok/c-toxcore/pull/837) Update version to 0.2.1.
 - [#833](https://github.com/TokTok/c-toxcore/pull/833) Add missing tox_nospam_size() function
 - [#832](https://github.com/TokTok/c-toxcore/pull/832) Don't set RTP_LARGE_FRAME on rtp audio packets
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96795ed3..56773dbb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ set(CMAKE_MODULE_PATH ${toxcore_SOURCE_DIR}/cmake)
 # versions in a synchronised way.
 set(PROJECT_VERSION_MAJOR "0")
 set(PROJECT_VERSION_MINOR "2")
-set(PROJECT_VERSION_PATCH "1")
+set(PROJECT_VERSION_PATCH "2")
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
 # set .so library version / following libtool scheme
diff --git a/configure.ac b/configure.ac
index a97f8242..418873ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.65])
-AC_INIT([tox], [0.2.1])
+AC_INIT([tox], [0.2.2])
 AC_CONFIG_AUX_DIR(configure_aux)
 AC_CONFIG_SRCDIR([toxcore/net_crypto.c])
 AC_CONFIG_HEADERS([config.h])
diff --git a/so.version b/so.version
index bedccaea..fb3d962d 100644
--- a/so.version
+++ b/so.version
@@ -11,6 +11,6 @@
 # For a full reference see:
 # https://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
 
-CURRENT=3
+CURRENT=4
 REVISION=0
-AGE=1
+AGE=2
diff --git a/toxcore/tox.api.h b/toxcore/tox.api.h
index d6148414..1c3b1121 100644
--- a/toxcore/tox.api.h
+++ b/toxcore/tox.api.h
@@ -179,7 +179,7 @@ const VERSION_MINOR                = 2;
  * The patch or revision number. Incremented when bugfixes are applied without
  * changing any functionality or API or ABI.
  */
-const VERSION_PATCH                = 1;
+const VERSION_PATCH                = 2;
 
 /**
  * A macro to check at preprocessing time whether the client code is compatible
diff --git a/toxcore/tox.h b/toxcore/tox.h
index c65f1e25..d5834095 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -180,7 +180,7 @@ uint32_t tox_version_minor(void);
  * The patch or revision number. Incremented when bugfixes are applied without
  * changing any functionality or API or ABI.
  */
-#define TOX_VERSION_PATCH              1
+#define TOX_VERSION_PATCH              2
 
 uint32_t tox_version_patch(void);