nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-29 04:03:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
29,322 Commits 53 Branches 630 Tags 128 MiB
922208bd2d
Commit Graph

29322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson
69918629f5 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-07-09 10:14:43 -04:00
Nick Mathewson
4a604d9938 Merge branch 'maint-0.2.9' into maint-0.3.2 2018-07-09 10:14:43 -04:00
Nick Mathewson
8b53dfc362 Merge branch 'bug26269_029' into maint-0.2.9 2018-07-09 10:14:39 -04:00
Nick Mathewson
7746b071d8 Merge remote-tracking branch 'gsomlo/gls-single-da' 2018-07-09 09:59:46 -04:00
Nick Mathewson
4ff93dd94f Merge remote-tracking branch 'rl1987/doc26638' 2018-07-09 09:40:04 -04:00
Nick Mathewson
a1a55a33c2 Merge branch 'bug26488' 2018-07-09 09:37:14 -04:00
rl1987
46998fc8fd Validate that DirAuthority address is IPv4 2018-07-09 09:37:09 -04:00
Nick Mathewson
03283c00d8 Merge remote-tracking branch 'rl1987/bug26525' 2018-07-09 09:31:12 -04:00
Nick Mathewson
47859e11e5 Merge branch 'maint-0.3.4' 
"Ours" to avoid version bump.
 2018-07-09 09:24:37 -04:00
Nick Mathewson
afee785417 Merge branch 'maint-0.3.3' into maint-0.3.4 
"ours" merge to avoid version bump
 2018-07-09 09:24:14 -04:00
Nick Mathewson
532873a924 Bump to 0.3.3.8 2018-07-09 09:24:07 -04:00
Nick Mathewson
9320100d6e Bump to 0.3.3.4-rc 2018-07-09 09:23:39 -04:00
Nick Mathewson
790062d720 Merge branch 'maint-0.3.4' 2018-07-09 09:22:13 -04:00
Nick Mathewson
b74ed31f90 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.
 2018-07-09 09:21:46 -04:00
Nick Mathewson
a95cfb8a58 Clear all control.c flags on control_free_all() 
Fixes bug 25512.

(Cherry-picked from 3519d0c808
 2018-07-09 09:20:45 -04:00
Nick Mathewson
8e3a52e5c3 Merge branch 'maint-0.3.4' 2018-07-09 09:14:41 -04:00
Nick Mathewson
75d9db9e5b Merge branch 'maint-0.3.3' into maint-0.3.4 2018-07-09 09:14:37 -04:00
Nick Mathewson
f721a08220 Merge remote-tracking branch 'catalyst-github/bug26455_033' into maint-0.3.3 2018-07-09 09:13:58 -04:00
Nick Mathewson
75f7064a13 Merge branch 'maint-0.3.4' 2018-07-09 09:11:42 -04:00
Nick Mathewson
d3894dc34b Merge branch 'maint-0.2.9' into maint-0.3.2 2018-07-09 09:11:41 -04:00
Nick Mathewson
1af69c1812 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-07-09 09:11:41 -04:00
Nick Mathewson
451a84cecb Merge branch 'maint-0.3.2' into maint-0.3.3 2018-07-09 09:11:41 -04:00
Nick Mathewson
844fc5eecb Merge branch 'maint-0.3.4' 2018-07-09 09:09:02 -04:00
Nick Mathewson
9b9625bdfa Merge branch 'maint-0.3.3' into maint-0.3.4 2018-07-09 09:09:01 -04:00
Nick Mathewson
fead22fb2a Merge remote-tracking branch 'mikeperry/bug25705_v3_033' into maint-0.3.3 2018-07-09 09:08:58 -04:00
Nick Mathewson
b8554dd880 Make Tor compile with --disable-memory-sentinels again 2018-07-09 08:44:16 -04:00
Karsten Loesing
9faa28b60e Update geoip and geoip6 to the July 3 2018 database. 2018-07-06 20:54:03 +02:00
Nick Mathewson
10c782d7fa Move ntmain.c into libtor-app again 
It's needed by main.c

Fixes bug 26662; bug not in any released Tor.
 2018-07-06 13:59:40 -04:00
Nick Mathewson
8b0920bb6f Merge branch 'split_or_directory' 2018-07-05 18:13:06 -04:00
Nick Mathewson
50963f36d7 Actually sort the lines in src/core/include.am 2018-07-05 17:15:50 -04:00
Nick Mathewson
667a6e8fe9 Whoops. Protover.[ch] belong in src/core/or 2018-07-05 17:15:50 -04:00
Nick Mathewson
f720a5a439 Fix everything that previously referred to src/or 2018-07-05 17:15:50 -04:00
Nick Mathewson
5f51c2de8b Fix our build system to know the new locations of the src/or stuff 2018-07-05 17:15:50 -04:00
Nick Mathewson
ef486e3c02 Fix every include path changed in the previous commit (automated) 
I am very glad to have written this script.
 2018-07-05 17:15:50 -04:00
Nick Mathewson
63b4ea22af 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.
 2018-07-05 17:15:50 -04:00
Nick Mathewson
ce84200542 Remove ancient unused script that used the old src/or location 2018-07-05 17:15:50 -04:00
Nick Mathewson
81cb0afb2b 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".
 2018-07-05 17:15:50 -04:00
Nick Mathewson
4eac5c6ce6 And tell build.rs to stop looking in src/common 2018-07-05 17:15:24 -04:00
Nick Mathewson
c73bb9937d Fix build.rs to handle removed common. 2018-07-05 17:14:55 -04:00
Nick Mathewson
753b797ca4 Fix up .may_includes for evloop. 2018-07-05 15:50:20 -04:00
Nick Mathewson
1dd5b5f441 Add a missing include. 2018-07-05 15:44:33 -04:00
Nick Mathewson
02ba0a2dbb Merge branch 'destroy_common' 2018-07-05 15:42:55 -04:00
Nick Mathewson
f7eff3008d Fix fuzzing_include_am.py 2018-07-05 15:22:17 -04:00
Nick Mathewson
2d69c32bb6 Clean up include paths for libtor-evloop (automated) 2018-07-05 15:22:17 -04:00
Nick Mathewson
1e417b7275 All remaining files in src/common belong to the event loop. 2018-07-05 15:22:17 -04:00
Nick Mathewson
947de40d19 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)
 2018-07-05 15:07:08 -04:00
Nick Mathewson
4593829861 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.
 2018-07-05 15:04:18 -04:00
Nick Mathewson
0adcfbc7c8 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.
 2018-07-05 14:51:07 -04:00
Nick Mathewson
24c0f83185 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.
 2018-07-05 14:48:29 -04:00
Nick Mathewson
0e4b1781f4 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.
 2018-07-05 14:45:34 -04:00