summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bug31343_31374_035' into bug31343_31374_040teor2019-08-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bug31343_31374_029' into bug31343_31374_035teor2019-08-09
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'tor-github/pr/1221' into combined31343_31374_029teor2019-08-09
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'tor-github/pr/1209' into combined31343_31374_029teor2019-08-09
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'tor-github/pr/1222' into combined31343_31374_035teor2019-08-09
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'tor-github/pr/1210' into combined31343_31374_035teor2019-08-09
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'tor-github/pr/1211' into test31343_040teor2019-08-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-0.4.1'Nick Mathewson2019-08-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ticket31374_035' into maint-0.4.1Nick Mathewson2019-08-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ticket31374_029' into ticket31374_035Nick Mathewson2019-08-08
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a warning about casting the results of GetProcAddress.Nick Mathewson2019-08-08
| | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tor-github/pr/1183'David Goulet2019-08-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Space out first connection_edge_process_relay_cell() line in circuit_receive_...Neel Chauhan2019-07-19
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tor-github/pr/1172'David Goulet2019-08-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make tor-print-ed-signing-cert output RFC1123 and unix timestamps as wellrl19872019-07-10
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint-0.4.1'Nick Mathewson2019-08-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ticket31343_040' into maint-0.4.1Nick Mathewson2019-08-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ticket31343_035' into ticket31343_040Nick Mathewson2019-08-08
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ticket31343_029' into ticket31343_035Nick Mathewson2019-08-08
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix another time_t/long warning for 31343.Nick Mathewson2019-08-08
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ticket31343_029' into ticket31343_035Nick Mathewson2019-08-08
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore proper behavior of netinfo skew checkNick Mathewson2019-08-08
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ticket31343_035' into ticket31343_040Nick Mathewson2019-08-06
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ticket31343_029' into ticket31343_035Nick Mathewson2019-08-06
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid using labs() on time_t in channeltls.cNick Mathewson2019-08-06
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint-0.4.1'teor2019-08-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint-0.4.0' into maint-0.4.1teor2019-08-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint-0.3.5' into maint-0.4.0teor2019-08-08
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5teor2019-08-08
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Travis: Log stem's TRACE logs to a file, and tail it on failureteor2019-07-01
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Travis: Don't log stem's SocketClosed TRACE logs to the consoleteor2019-06-14
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Travis: only run the stem tests that use a tor binaryteor2019-05-30
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Travis: make stem log a controller trace, and tail stem's tor logteor2019-05-28
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint-0.4.1'teor2019-08-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint-0.4.0' into maint-0.4.1teor2019-08-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint-0.3.5' into maint-0.4.0teor2019-08-08
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint-0.2.9' into maint-0.3.5teor2019-08-08
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'tor-github/pr/1155' into maint-0.2.9teor2019-08-08
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'tor-github/pr/991' into maint-0.2.9teor2019-08-08
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changes filerl19872019-04-30
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Travis: remove sudo configurationrl19872019-04-30
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'tor-github/pr/1156' into maint-0.3.5teor2019-08-08
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'tor-github/pr/1157' into maint-0.4.0teor2019-08-08
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'tor-github/pr/1208'Nick Mathewson2019-08-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | practracker: Make it happy after rebaseDavid Goulet2019-08-06
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hs-v3: Rename HS DoS default definesDavid Goulet2019-08-06
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test: Series of fixes for hs_dos.c unit testsDavid Goulet2019-08-06
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dos: Update HS intro circuits if parameters changeDavid Goulet2019-08-06
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hs-v3: Add enable/disable HS DoS introduce parameterDavid Goulet2019-08-06
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hs-v3: Add consensus parameters for DoS defensesDavid Goulet2019-08-06