summaryrefslogtreecommitdiff
Commit message (Expand)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
* | | | | 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
* | | | | | | 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
* | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson2018-07-09
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Clear all control.c flags on control_free_all()Nick 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 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
* | | | | | | | | | | 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
* | | | | | | | | | | | 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
| * | | | | | | | | | | | Move literally everything out of src/orNick Mathewson2018-07-05