Commit 1628af23 authored by David Goulet's avatar David Goulet 🐼
Browse files

Merge branch 'maint-0.3.5' into release-0.3.5

parents ef17aa0d 421ce943

changes/fallbackdirs-2022-01-24

0 → 100644
+2 −0
Original line number Diff line number Diff line 
  o Minor features (fallbackdir):

    - Regenerate fallback directories generated on January 24, 2022.

changes/geoip-2022-01-24

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor features (geoip data):

    - Update the geoip files to match the IPFire Location Database,

      as retrieved on 2022/01/24.

configure.ac

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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/app/config/fallback_dirs.inc

+496 −470

File changed.

Preview size limit exceeded, changes collapsed.