summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'ticket25573-034' into ticket25573-masterticket25573-masterMike Perry2018-08-29
|\
| * Ticket #25573: Count TRUNCATED cells.ticket25573-v2-squashed3ticket25573-034Mike Perry2018-08-29
| * Ticket #25573: Check half-opened stream ids when choosing a new oneMike Perry2018-08-29
| * Ticket #25573: Track half-closed stream idsMike Perry2018-08-29
| * Mark smartlist_bsearch as taking a const list.Mike Perry2018-08-29
* | Merge branch 'maint-0.3.4'Nick Mathewson2018-08-29
|\ \
| * \ Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson2018-08-29
| |\ \
| | * \ Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson2018-08-29
| | |\ \
| | | * \ Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson2018-08-29
| | | |\ \
| | | | * | Test: avoid spurious failures in make test-network-allteor2018-08-29
| | | | * | Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.amteor2018-08-29
* | | | | | Merge remote-tracking branch 'onionk/prototest1'Nick Mathewson2018-08-28
|\ \ \ \ \ \
| * | | | | | test/protover: add test for whitespace parsing bugcypherpunks2018-08-17
| * | | | | | test/protover: add test for hyphen parsing bugcypherpunks2018-08-17
* | | | | | | fix man page issue noticed during #26367 reviewRoger Dingledine2018-08-28
* | | | | | | Set the file encoding in checkIncludes.py with Python3Nick Mathewson2018-08-28
* | | | | | | make a comment more rightRoger Dingledine2018-08-28
* | | | | | | Merge remote-tracking branch 'teor/bug22747'Nick Mathewson2018-08-28
|\ \ \ \ \ \ \
| * | | | | | | doc: Explain how to limit Tor's sockets in the man pageteor2018-08-17
* | | | | | | | Merge remote-tracking branch 'onionk/connection-comments1'Nick Mathewson2018-08-28
|\ \ \ \ \ \ \ \
| * | | | | | | | core/mainloop: more comments documenting connection.ccypherpunks2018-08-27
| * | | | | | | | core/mainloop: fix documentation of connection_handle_write_impl()cypherpunks2018-08-27
* | | | | | | | | Merge branch 'bug26367_035_01'Nick Mathewson2018-08-28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | hs: Remove rend_client_non_anonymous_mode_enabledDavid Goulet2018-08-28
| * | | | | | | | | hs: Remove rend_client_allow_non_anonymous_connectionDavid Goulet2018-08-28
| * | | | | | | | | circ: Remove useless param from cannibalization functionDavid Goulet2018-08-28
| * | | | | | | | | hs: Render obsolete Tor2webDavid Goulet2018-08-28
* | | | | | | | | | Merge remote-tracking branch 'dgoulet/ticket27215_035_01'Nick Mathewson2018-08-28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixup! hs: Change default version from 2 to 3David Goulet2018-08-28
* | | | | | | | | | | Fix log.c comments about assert vs tor_assert vs raw_assert.Nick Mathewson2018-08-28
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | fixup! hs: Learn service version by trying to load the keysDavid Goulet2018-08-28
| * | | | | | | | | | hs: Change default version from 2 to 3David Goulet2018-08-22
| * | | | | | | | | | hs: Learn service version by trying to load the keysDavid Goulet2018-08-22
| * | | | | | | | | | key: Make ed_key_init_from_file() take an or_options_tDavid Goulet2018-08-22
* | | | | | | | | | | Merge remote-tracking branch 'tor-github/pr/245'Nick Mathewson2018-08-28
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add regression test for Bug #20874Neel Chauhan2018-08-11
| * | | | | | | | | | | Add changes file for Bug #20874Neel Chauhan2018-07-20
| * | | | | | | | | | | Add a "reject *:*" line after parsing in parse_reachable_addresses()Neel Chauhan2018-07-20
| * | | | | | | | | | | Don't prepend reject *:* to Reachable(OR/Dir)Addresses in options_validate()Neel Chauhan2018-07-20
* | | | | | | | | | | | Merge remote-tracking branch 'tor-github/pr/279'Nick Mathewson2018-08-28
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | doc/tor: add note for IPv6-only hosts (fixes #27204)traumschule2018-08-19
* | | | | | | | | | | | | Merge branch 'bug26896_034'Nick Mathewson2018-08-28
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fixup! Check for duplicate-close in connection_dir_finished_flusing()Nick Mathewson2018-08-21
| * | | | | | | | | | | | | Check for duplicate-close in connection_dir_finished_flusing()Nick Mathewson2018-08-21
* | | | | | | | | | | | | | Merge branch 'maint-0.3.4'Nick Mathewson2018-08-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | / / / / / | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson2018-08-27
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson2018-08-27
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | When running make test-network-all, use the mixed+hs-v2 networkteor2018-08-27
* | | | | | | | | | | | | Merge branch 'maint-0.3.4'Nick Mathewson2018-08-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Update to 0.3.4.7-rc-devNick Mathewson2018-08-24