nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-12 22:23:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.5' into release-0.3.5

Browse Source
This commit is contained in:
David Goulet 2022-01-24 10:49:41 -05:00
commit 1628af235e
8 changed files with 22374 additions and 12407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changes/fallbackdirs-2022-01-24 Normal file
View File

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

3
changes/geoip-2022-01-24 Normal file
View File

@ -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.

2
configure.ac
View File

@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
dnl See LICENSE for licensing information dnl See LICENSE for licensing information
AC_PREREQ([2.63]) 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_SRCDIR([src/app/main/tor_main.c])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])

2
contrib/win32build/tor-mingw.nsi.in
View File

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

1800
src/app/config/fallback_dirs.inc
View File

File diff suppressed because it is too large Load Diff

19654
src/config/geoip
View File

File diff suppressed because it is too large Load Diff

13316
src/config/geoip6
View File

File diff suppressed because it is too large Load Diff

2
src/win32/orconfig.h
View File

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