Merge branch 'maint-0.3.5' into release-0.3.5

changes/fallbackdirs-2022-01-24

@@ -0,0 +1,2 @@
+  o Minor features (fallbackdir):
+    - Regenerate fallback directories generated on January 24, 2022.

changes/geoip-2022-01-24

@@ -0,0 +1,3 @@
+  o Minor features (geoip data):
+    - Update the geoip files to match the IPFire Location Database,
+      as retrieved on 2022/01/24.

configure.ac

@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.17-dev])
+AC_INIT([tor],[0.3.5.18])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 

contrib/win32build/tor-mingw.nsi.in

@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.17-dev"
+!define VERSION "0.3.5.18"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/"
 !define LICENSE "LICENSE"

src/win32/orconfig.h

@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.17-dev"
+#define VERSION "0.3.5.18"