summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Lower log level of "Scheduler of type KIST has been enabled" to INFOissue26703Matt Traudt2018-07-09
|
* Remove changes files for items that will appear in 0.3.4.4-rcNick Mathewson2018-07-09
|
* Merge branch 'maint-0.3.4'Nick Mathewson2018-07-09
|\
| * Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson2018-07-09
| |\
| | * Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson2018-07-09
| | |\
| | | * Merge remote-tracking branch 'github/bug26269_031' into maint-0.3.2Nick Mathewson2018-07-09
| | | |\
| | | | * test_entrynodes: fix a GCC warningNick Mathewson2018-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some versions of GCC complain that the bfn_mock_node_get_by_id function might return NULL, but we're assuming that it won't. (We're assuming it won't return NULL because we know in the tests that we're passing it valid IDs.) To make GCC happy, tt_assert() that each node_t is set before using it. Fixes a second case of bug26269; bugfix on 0.3.0.1-alpha.
* | | | | Merge branch 'maint-0.3.4'Nick Mathewson2018-07-09
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson2018-07-09
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson2018-07-09
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson2018-07-09
| | | |\ \
| | | | * \ Merge branch 'bug26269_029' into maint-0.2.9Nick Mathewson2018-07-09
| | | | |\ \
| | | | | * | Fix a GCC "potential null dereference" warning.Nick Mathewson2018-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 26269; bugfix on c30be5a82d47328 in 0.2.8.2-alpha
* | | | | | | Changes file and comment for 25928.Nick Mathewson2018-07-09
| | | | | | |
* | | | | | | Merge remote-tracking branch 'gsomlo/gls-single-da'Nick Mathewson2018-07-09
|\ \ \ \ \ \ \
| * | | | | | | Allow single DA if explicitly configuredGabriel L. Somlo2018-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | Merge remote-tracking branch 'rl1987/doc26638'Nick Mathewson2018-07-09
|\ \ \ \ \ \ \ \
| * | | | | | | | Add CODE_OF_CONDUCT filerl19872018-07-05
| |/ / / / / / /
* | | | | | | | Merge branch 'bug26488'Nick Mathewson2018-07-09
|\ \ \ \ \ \ \ \
| * | | | | | | | Validate that DirAuthority address is IPv4rl19872018-07-09
| | | | | | | | |
* | | | | | | | | Merge remote-tracking branch 'rl1987/bug26525'Nick Mathewson2018-07-09
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rename sandbox_getaddrinfo() et. al.rl19872018-07-03
| | | | | | | | | |
* | | | | | | | | | Merge branch 'maint-0.3.4'Nick Mathewson2018-07-09
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | "Ours" to avoid version bump.
| * | | | | | | | | Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson2018-07-09
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | "ours" merge to avoid version bump
| | * | | | | | | | Bump to 0.3.3.8Nick Mathewson2018-07-09
| | | | | | | | | |
| * | | | | | | | | Bump to 0.3.3.4-rcNick Mathewson2018-07-09
| | | | | | | | | |
* | | | | | | | | | Merge branch 'maint-0.3.4'Nick Mathewson2018-07-09
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson2018-07-09
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "ours" merge to avoid cherry-picked copy of #25512 fix, which is already in this branch.
| | * | | | | | | | Clear all control.c flags on control_free_all()Nick Mathewson2018-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 25512. (Cherry-picked from 3519d0c8086ede
* | | | | | | | | | Merge branch 'maint-0.3.4'Nick Mathewson2018-07-09
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson2018-07-09
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge remote-tracking branch 'catalyst-github/bug26455_033' into maint-0.3.3Nick Mathewson2018-07-09
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Use correct CARGO_HOME in test_rust.shTaylor Yu2018-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Out-of-tree builds could fail to run the rust tests if built in offline mode. cargo expects CARGO_HOME to point to the .cargo directory, not the directory containing .cargo. Fixes bug 26455; bug not in any released tor.
* | | | | | | | | | | Merge branch 'maint-0.3.4'Nick Mathewson2018-07-09
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson2018-07-09
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson2018-07-09
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson2018-07-09
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / | | | | |/| | | | | |
| | | | * | | | | | | Update geoip and geoip6 to the July 3 2018 database.Karsten Loesing2018-07-06
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'maint-0.3.4'Nick Mathewson2018-07-09
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson2018-07-09
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge remote-tracking branch 'mikeperry/bug25705_v3_033' into maint-0.3.3Nick Mathewson2018-07-09
| | |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | | Make Tor compile with --disable-memory-sentinels againNick Mathewson2018-07-09
| | | | | | | | | | | |
* | | | | | | | | | | | Move ntmain.c into libtor-app againNick Mathewson2018-07-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's needed by main.c Fixes bug 26662; bug not in any released Tor.
* | | | | | | | | | | | Merge branch 'split_or_directory'Nick Mathewson2018-07-05
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Actually sort the lines in src/core/include.amNick Mathewson2018-07-05
| | | | | | | | | | | | |
| * | | | | | | | | | | | Whoops. Protover.[ch] belong in src/core/orNick Mathewson2018-07-05
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix everything that previously referred to src/orNick Mathewson2018-07-05
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix our build system to know the new locations of the src/or stuffNick Mathewson2018-07-05
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix every include path changed in the previous commit (automated)Nick Mathewson2018-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I am very glad to have written this script.
| * | | | | | | | | | | | Move literally everything out of src/orNick Mathewson2018-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.