]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
7 years agoDocument the headers in src/app/config/
Nick Mathewson [Tue, 10 Jul 2018 16:28:22 +0000 (12:28 -0400)] 
Document the headers in src/app/config/

7 years agoFile-level summary documentation for src/lib/*/*.[ch]
Nick Mathewson [Tue, 10 Jul 2018 16:22:01 +0000 (12:22 -0400)] 
File-level summary documentation for src/lib/*/*.[ch]

7 years agoDescribe "check-includes" in the CodingStandards.md file
Nick Mathewson [Tue, 10 Jul 2018 15:09:25 +0000 (11:09 -0400)] 
Describe "check-includes" in the CodingStandards.md file

7 years agoStop mentioning src/or and src/common in doc/HACKING
Nick Mathewson [Tue, 10 Jul 2018 15:03:45 +0000 (11:03 -0400)] 
Stop mentioning src/or and src/common in doc/HACKING

7 years agoAdd an initial CodeStructure.md file to doc/HACKING.
Nick Mathewson [Tue, 10 Jul 2018 15:01:07 +0000 (11:01 -0400)] 
Add an initial CodeStructure.md file to doc/HACKING.

Not complete or pretty, but better than nothing.

7 years agoMake checkIncludes work on python 2.7
Nick Mathewson [Mon, 9 Jul 2018 19:46:39 +0000 (15:46 -0400)] 
Make checkIncludes work on python 2.7

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Mon, 9 Jul 2018 19:17:59 +0000 (15:17 -0400)] 
Merge branch 'maint-0.3.4'

"ours" to avoid a pair of version bumps.

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Mon, 9 Jul 2018 19:17:48 +0000 (15:17 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" to avoid version bump.

7 years agoBump to 0.3.4.4-rc-dev
Nick Mathewson [Mon, 9 Jul 2018 19:17:38 +0000 (15:17 -0400)] 
Bump to 0.3.4.4-rc-dev

7 years agoBump to 0.3.3.8-dev.
Nick Mathewson [Mon, 9 Jul 2018 19:17:16 +0000 (15:17 -0400)] 
Bump to 0.3.3.8-dev.

7 years agoCopy notes from today's releases into master
Nick Mathewson [Mon, 9 Jul 2018 19:16:22 +0000 (15:16 -0400)] 
Copy notes from today's releases into master

7 years agoFix some lingering windows compilation issues from Jenkins.
Nick Mathewson [Mon, 9 Jul 2018 16:54:40 +0000 (12:54 -0400)] 
Fix some lingering windows compilation issues from Jenkins.

These were caused by the recent refactoring.

7 years agostrcasecmp should not take a size_t argument
Nick Mathewson [Mon, 9 Jul 2018 15:17:23 +0000 (11:17 -0400)] 
strcasecmp should not take a size_t argument

7 years agoRemove changes files for items that will appear in 0.3.4.4-rc
Nick Mathewson [Mon, 9 Jul 2018 14:30:12 +0000 (10:30 -0400)] 
Remove changes files for items that will appear in 0.3.4.4-rc

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Mon, 9 Jul 2018 14:17:20 +0000 (10:17 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Mon, 9 Jul 2018 14:17:20 +0000 (10:17 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Mon, 9 Jul 2018 14:17:20 +0000 (10:17 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge remote-tracking branch 'github/bug26269_031' into maint-0.3.2
Nick Mathewson [Mon, 9 Jul 2018 14:17:17 +0000 (10:17 -0400)] 
Merge remote-tracking branch 'github/bug26269_031' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Mon, 9 Jul 2018 14:16:51 +0000 (10:16 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoChanges file and comment for 25928.
Nick Mathewson [Mon, 9 Jul 2018 14:16:48 +0000 (10:16 -0400)] 
Changes file and comment for 25928.

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Mon, 9 Jul 2018 14:15:16 +0000 (10:15 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Mon, 9 Jul 2018 14:14:43 +0000 (10:14 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Mon, 9 Jul 2018 14:14:43 +0000 (10:14 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'bug26269_029' into maint-0.2.9
Nick Mathewson [Mon, 9 Jul 2018 14:14:39 +0000 (10:14 -0400)] 
Merge branch 'bug26269_029' into maint-0.2.9

7 years agoMerge remote-tracking branch 'gsomlo/gls-single-da'
Nick Mathewson [Mon, 9 Jul 2018 13:59:46 +0000 (09:59 -0400)] 
Merge remote-tracking branch 'gsomlo/gls-single-da'

7 years agoMerge remote-tracking branch 'rl1987/doc26638'
Nick Mathewson [Mon, 9 Jul 2018 13:40:04 +0000 (09:40 -0400)] 
Merge remote-tracking branch 'rl1987/doc26638'

7 years agoMerge branch 'bug26488'
Nick Mathewson [Mon, 9 Jul 2018 13:37:14 +0000 (09:37 -0400)] 
Merge branch 'bug26488'

7 years agoValidate that DirAuthority address is IPv4
rl1987 [Tue, 26 Jun 2018 11:30:02 +0000 (14:30 +0300)] 
Validate that DirAuthority address is IPv4

7 years agoMerge remote-tracking branch 'rl1987/bug26525'
Nick Mathewson [Mon, 9 Jul 2018 13:31:12 +0000 (09:31 -0400)] 
Merge remote-tracking branch 'rl1987/bug26525'

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Mon, 9 Jul 2018 13:24:37 +0000 (09:24 -0400)] 
Merge branch 'maint-0.3.4'

"Ours" to avoid version bump.

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Mon, 9 Jul 2018 13:24:14 +0000 (09:24 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" merge to avoid version bump

7 years agoBump to 0.3.3.8
Nick Mathewson [Mon, 9 Jul 2018 13:24:07 +0000 (09:24 -0400)] 
Bump to 0.3.3.8

7 years agoBump to 0.3.3.4-rc
Nick Mathewson [Mon, 9 Jul 2018 13:23:39 +0000 (09:23 -0400)] 
Bump to 0.3.3.4-rc

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Mon, 9 Jul 2018 13:22:13 +0000 (09:22 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Mon, 9 Jul 2018 13:21:46 +0000 (09:21 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" merge to avoid cherry-picked copy of #25512 fix, which is already in
this branch.

7 years agoClear all control.c flags on control_free_all()
Nick Mathewson [Fri, 23 Mar 2018 15:31:56 +0000 (11:31 -0400)] 
Clear all control.c flags on control_free_all()

Fixes bug 25512.

(Cherry-picked from 3519d0c8086ede

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Mon, 9 Jul 2018 13:14:41 +0000 (09:14 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Mon, 9 Jul 2018 13:14:37 +0000 (09:14 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge remote-tracking branch 'catalyst-github/bug26455_033' into maint-0.3.3
Nick Mathewson [Mon, 9 Jul 2018 13:13:58 +0000 (09:13 -0400)] 
Merge remote-tracking branch 'catalyst-github/bug26455_033' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Mon, 9 Jul 2018 13:11:42 +0000 (09:11 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Mon, 9 Jul 2018 13:11:41 +0000 (09:11 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Mon, 9 Jul 2018 13:11:41 +0000 (09:11 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Mon, 9 Jul 2018 13:11:41 +0000 (09:11 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Mon, 9 Jul 2018 13:09:02 +0000 (09:09 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Mon, 9 Jul 2018 13:09:01 +0000 (09:09 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge remote-tracking branch 'mikeperry/bug25705_v3_033' into maint-0.3.3
Nick Mathewson [Mon, 9 Jul 2018 13:08:58 +0000 (09:08 -0400)] 
Merge remote-tracking branch 'mikeperry/bug25705_v3_033' into maint-0.3.3

7 years agoMake Tor compile with --disable-memory-sentinels again
Nick Mathewson [Mon, 9 Jul 2018 12:44:16 +0000 (08:44 -0400)] 
Make Tor compile with --disable-memory-sentinels again

7 years agoUpdate geoip and geoip6 to the July 3 2018 database.
Karsten Loesing [Fri, 6 Jul 2018 18:54:03 +0000 (20:54 +0200)] 
Update geoip and geoip6 to the July 3 2018 database.

7 years agoMove ntmain.c into libtor-app again
Nick Mathewson [Fri, 6 Jul 2018 17:59:40 +0000 (13:59 -0400)] 
Move ntmain.c into libtor-app again

It's needed by main.c

Fixes bug 26662; bug not in any released Tor.

7 years agoMerge branch 'split_or_directory'
Nick Mathewson [Thu, 5 Jul 2018 22:13:06 +0000 (18:13 -0400)] 
Merge branch 'split_or_directory'

7 years agoActually sort the lines in src/core/include.am
Nick Mathewson [Thu, 5 Jul 2018 21:10:22 +0000 (17:10 -0400)] 
Actually sort the lines in src/core/include.am

7 years agoWhoops. Protover.[ch] belong in src/core/or
Nick Mathewson [Thu, 5 Jul 2018 21:08:26 +0000 (17:08 -0400)] 
Whoops.  Protover.[ch] belong in src/core/or

7 years agoFix everything that previously referred to src/or
Nick Mathewson [Thu, 5 Jul 2018 21:05:54 +0000 (17:05 -0400)] 
Fix everything that previously referred to src/or

7 years agoFix our build system to know the new locations of the src/or stuff
Nick Mathewson [Thu, 5 Jul 2018 20:52:12 +0000 (16:52 -0400)] 
Fix our build system to know the new locations of the src/or stuff

7 years agoFix every include path changed in the previous commit (automated)
Nick Mathewson [Thu, 5 Jul 2018 20:34:59 +0000 (16:34 -0400)] 
Fix every include path changed in the previous commit (automated)

I am very glad to have written this script.

7 years agoMove literally everything out of src/or
Nick Mathewson [Thu, 5 Jul 2018 20:31:38 +0000 (16:31 -0400)] 
Move literally everything out of src/or

This commit won't build yet -- it just puts everything in a slightly
more logical place.

The reasoning here is that "src/core" will hold the stuff that every (or
nearly every) tor instance will need in order to do onion routing.
Other features (including some necessary ones) will live in
"src/feature".  The "src/app" directory will hold the stuff needed
to have Tor be an application you can actually run.

This commit DOES NOT refactor the former contents of src/or into a
logical set of acyclic libraries, or change any code at all.  That
will have to come in the future.

We will continue to move things around and split them in the future,
but I hope this lays a reasonable groundwork for doing so.

7 years agoRemove ancient unused script that used the old src/or location
Nick Mathewson [Thu, 5 Jul 2018 20:05:53 +0000 (16:05 -0400)] 
Remove ancient unused script that used the old src/or location

7 years agoStart splitting src/or
Nick Mathewson [Thu, 5 Jul 2018 20:04:32 +0000 (16:04 -0400)] 
Start splitting src/or

This is a very gentle commit that just lays the groundwork in the
build system: it puts the include files to build libtor-app.a into
src/core, and to build the tor executable into src/app.  The
executable is now "src/app/tor".

7 years agoAnd tell build.rs to stop looking in src/common
Nick Mathewson [Thu, 5 Jul 2018 21:15:24 +0000 (17:15 -0400)] 
And tell build.rs to stop looking in src/common

7 years agoFix build.rs to handle removed common.
Nick Mathewson [Thu, 5 Jul 2018 21:14:55 +0000 (17:14 -0400)] 
Fix build.rs to handle removed common.

7 years agoFix up .may_includes for evloop.
Nick Mathewson [Thu, 5 Jul 2018 19:50:20 +0000 (15:50 -0400)] 
Fix up .may_includes for evloop.

7 years agoAdd a missing include.
Nick Mathewson [Thu, 5 Jul 2018 19:44:33 +0000 (15:44 -0400)] 
Add a missing include.

7 years agoMerge branch 'destroy_common'
Nick Mathewson [Thu, 5 Jul 2018 19:42:55 +0000 (15:42 -0400)] 
Merge branch 'destroy_common'

7 years agoFix fuzzing_include_am.py
Nick Mathewson [Thu, 5 Jul 2018 19:21:30 +0000 (15:21 -0400)] 
Fix fuzzing_include_am.py

7 years agoClean up include paths for libtor-evloop (automated)
Nick Mathewson [Thu, 5 Jul 2018 19:14:04 +0000 (15:14 -0400)] 
Clean up include paths for libtor-evloop (automated)

7 years agoAll remaining files in src/common belong to the event loop.
Nick Mathewson [Thu, 5 Jul 2018 19:13:44 +0000 (15:13 -0400)] 
All remaining files in src/common belong to the event loop.

7 years agoMove openbsd-malloc responsibility to lib/malloc
Nick Mathewson [Thu, 5 Jul 2018 19:07:08 +0000 (15:07 -0400)] 
Move openbsd-malloc responsibility to lib/malloc

(Note that this is not believed to work, but we may as well have it
in the right place till we remove it)

7 years agoRemove util.h
Nick Mathewson [Thu, 5 Jul 2018 19:04:18 +0000 (15:04 -0400)] 
Remove util.h

Inline its contents (which were all includes) into or.h, and some of
its contents into other places that didn't include or.h at all.

7 years agoMove address_set to src/or
Nick Mathewson [Thu, 5 Jul 2018 18:51:07 +0000 (14:51 -0400)] 
Move address_set to src/or

This is temporary, until src/or is split.

Putting this in containers would be another logical alternative,
except that addresses depend on containers, and we don't like
cycles.

7 years agoMove socks5_status.h to src/lib/net
Nick Mathewson [Thu, 5 Jul 2018 18:48:29 +0000 (14:48 -0400)] 
Move socks5_status.h to src/lib/net

There might be a better place for it in the long run, but this is
the best I can think of for now.

7 years agoMove handles.h to src/lib/container
Nick Mathewson [Thu, 5 Jul 2018 18:45:34 +0000 (14:45 -0400)] 
Move handles.h to src/lib/container

There might be a better place for it in the long run, but this is
the best we can think of for now.

7 years agoInclude compat_string.h in smartlist.c
Nick Mathewson [Thu, 5 Jul 2018 17:53:17 +0000 (13:53 -0400)] 
Include compat_string.h in smartlist.c

We need this for strcasecmp on (some) Windows build environments.

Fix from Gisle Vanem.

7 years agoTry to use stricmp variants that MSDN actually recommends
Nick Mathewson [Thu, 5 Jul 2018 17:51:48 +0000 (13:51 -0400)] 
Try to use stricmp variants that MSDN actually recommends

Per recommendation by Gisle Vanem

7 years agoAdd CODE_OF_CONDUCT file
rl1987 [Thu, 5 Jul 2018 08:22:33 +0000 (11:22 +0300)] 
Add CODE_OF_CONDUCT file

7 years agoAllow single DA if explicitly configured
Gabriel L. Somlo [Mon, 14 May 2018 15:47:22 +0000 (11:47 -0400)] 
Allow single DA if explicitly configured

When on a private network a single directory authority is explicitly
configured, allow that DA's instace of tor to pick itself as its own
DA, by having router_pick_dirserver_generic() set the PDS_ALLOW_SELF
flag when the list of potential sources contains only one element.
This would subsequently allow router_pick_trusteddirserver_impl() to
calculate is 'requreother' condition as 'false', enabling it to pick
itself as a valid DA candidate.

Fixes #25928

Signed-off-by: Gabriel Somlo <gsomlo@gmail.com>
7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Tue, 3 Jul 2018 17:31:26 +0000 (13:31 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge remote-tracking branch 'github/bug26568_034' into maint-0.3.4
Nick Mathewson [Tue, 3 Jul 2018 17:16:37 +0000 (13:16 -0400)] 
Merge remote-tracking branch 'github/bug26568_034' into maint-0.3.4

7 years agoMerge remote-tracking branch 'github/ticket26626'
Nick Mathewson [Tue, 3 Jul 2018 16:52:43 +0000 (12:52 -0400)] 
Merge remote-tracking branch 'github/ticket26626'

7 years agoMerge branch 'bug26522'
Nick Mathewson [Tue, 3 Jul 2018 15:34:36 +0000 (11:34 -0400)] 
Merge branch 'bug26522'

7 years agoRefrain from potentially insecure usage of strncat()
rl1987 [Tue, 3 Jul 2018 10:36:15 +0000 (13:36 +0300)] 
Refrain from potentially insecure usage of strncat()

7 years agoMerge remote-tracking branch 'github/shrink_or_h_more'
Nick Mathewson [Tue, 3 Jul 2018 15:09:54 +0000 (11:09 -0400)] 
Merge remote-tracking branch 'github/shrink_or_h_more'

7 years agoFix up some windows compilation issues.
Nick Mathewson [Tue, 3 Jul 2018 15:00:18 +0000 (11:00 -0400)] 
Fix up some windows compilation issues.

These were mostly cases where our previous macros had been casting,
and the values that we were trying to printf were not in fact
uint64_t.

7 years agoRetire U64_TO_DBL and DBL_TO_U64
Nick Mathewson [Tue, 3 Jul 2018 14:43:43 +0000 (10:43 -0400)] 
Retire U64_TO_DBL and DBL_TO_U64

These were necessary long ago to work around a bug in VC6.

7 years agoReturn U64_PRINTF_ARG and U64_FORMAT
Nick Mathewson [Tue, 3 Jul 2018 14:40:59 +0000 (10:40 -0400)] 
Return U64_PRINTF_ARG and U64_FORMAT

The standard is printf("%"PRIu64, x);

7 years agoReplace U64_LITERAL with the standard UINT64_C
Nick Mathewson [Tue, 3 Jul 2018 14:33:50 +0000 (10:33 -0400)] 
Replace U64_LITERAL with the standard UINT64_C

7 years agoRetire some unused (or nearly unused) macros.
Nick Mathewson [Tue, 3 Jul 2018 14:31:19 +0000 (10:31 -0400)] 
Retire some unused (or nearly unused) macros.

7 years agoUse the standard SHRT_MAX name.
Nick Mathewson [Tue, 3 Jul 2018 14:28:10 +0000 (10:28 -0400)] 
Use the standard SHRT_MAX name.

7 years agoClean up various things that broke with our stdint.h changes
Nick Mathewson [Tue, 3 Jul 2018 14:26:06 +0000 (10:26 -0400)] 
Clean up various things that broke with our stdint.h changes

Casting before printf was necessary; now it's not so smart.

We don't have SIZEOF_UINT8_T any more.

7 years agoRequire stdint.h and inttypes.h
Nick Mathewson [Tue, 3 Jul 2018 14:25:31 +0000 (10:25 -0400)] 
Require stdint.h and inttypes.h

We've been silently requiring stdint.h for a while now, and nobody
has complained.  Closes ticket 26626.

7 years agoMerge remote-tracking branch 'rl1987/ticket26527'
Nick Mathewson [Tue, 3 Jul 2018 13:53:46 +0000 (09:53 -0400)] 
Merge remote-tracking branch 'rl1987/ticket26527'

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Tue, 3 Jul 2018 13:48:03 +0000 (09:48 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Tue, 3 Jul 2018 13:48:03 +0000 (09:48 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Tue, 3 Jul 2018 13:48:03 +0000 (09:48 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Tue, 3 Jul 2018 13:48:03 +0000 (09:48 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'bug26535_032' into maint-0.3.2
Nick Mathewson [Tue, 3 Jul 2018 13:48:00 +0000 (09:48 -0400)] 
Merge branch 'bug26535_032' into maint-0.3.2

7 years agoMerge branch 'bug26535_029' into maint-0.2.9
Nick Mathewson [Tue, 3 Jul 2018 13:47:41 +0000 (09:47 -0400)] 
Merge branch 'bug26535_029' into maint-0.2.9

7 years agoRename sandbox_getaddrinfo() et. al.
rl1987 [Tue, 3 Jul 2018 11:27:57 +0000 (14:27 +0300)] 
Rename sandbox_getaddrinfo() et. al.

7 years agoRemove ATTR_NONNULL macro
rl1987 [Tue, 3 Jul 2018 09:33:09 +0000 (12:33 +0300)] 
Remove ATTR_NONNULL macro

7 years agoPartially revert "Use tor_addr_from_getsockname() in several places"
Nick Mathewson [Mon, 2 Jul 2018 20:11:02 +0000 (16:11 -0400)] 
Partially revert "Use tor_addr_from_getsockname() in several places"

This reverts part of commit 6ed384b827dce21ea3a44b587, in order to
fix bug 26568.  Bugfix on 0.3.4.1-alpha.

7 years agohs_ntor_ref.py: pass only strings to subprocess.Popen
Nick Mathewson [Mon, 2 Jul 2018 18:04:46 +0000 (14:04 -0400)] 
hs_ntor_ref.py: pass only strings to subprocess.Popen

Recent Python3 versions seem to require this on Windows.

Fixes bug 26535; bug copied from ntor_ref.py on 0.3.1.1-alpha.