summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-08-09Merge remote-tracking branch 'tor-github/pr/1210' into combined31343_31374_035teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/1221' into combined31343_31374_029teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/1209' into combined31343_31374_029teor
2019-08-08Merge branch 'maint-0.4.1'Nick Mathewson
2019-08-08Merge branch 'ticket31374_035' into maint-0.4.1Nick Mathewson
2019-08-08Merge branch 'tor-github/pr/1183'David Goulet
2019-08-08Merge branch 'tor-github/pr/1172'David Goulet
2019-08-08Merge branch 'ticket31374_029' into ticket31374_035Nick Mathewson
2019-08-08Fix a warning about casting the results of GetProcAddress.Nick Mathewson
2019-08-08Merge branch 'maint-0.4.1'Nick Mathewson
2019-08-08Merge branch 'ticket31343_040' into maint-0.4.1Nick Mathewson
2019-08-08Merge branch 'ticket31343_035' into ticket31343_040Nick Mathewson
2019-08-08Merge branch 'ticket31343_029' into ticket31343_035Nick Mathewson
2019-08-08Fix another time_t/long warning for 31343.Nick Mathewson
2019-08-08Merge branch 'ticket31343_029' into ticket31343_035Nick Mathewson
2019-08-08Restore proper behavior of netinfo skew checkNick Mathewson
2019-08-08Merge branch 'maint-0.4.1'teor
2019-08-08Merge branch 'maint-0.4.0' into maint-0.4.1teor
2019-08-08Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-08-08Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5teor
2019-08-08Merge branch 'maint-0.4.1'teor
2019-08-08Merge branch 'maint-0.4.0' into maint-0.4.1teor
2019-08-08Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-08-08Merge branch 'maint-0.2.9' into maint-0.3.5teor
2019-08-08Merge remote-tracking branch 'tor-github/pr/1157' into maint-0.4.0teor
2019-08-08Merge remote-tracking branch 'tor-github/pr/1156' into maint-0.3.5teor
2019-08-08Merge remote-tracking branch 'tor-github/pr/1155' into maint-0.2.9teor
2019-08-08Merge remote-tracking branch 'tor-github/pr/991' into maint-0.2.9teor
2019-08-07Merge remote-tracking branch 'tor-github/pr/1208'Nick Mathewson
2019-08-06changes file for ticket 31320Nick Mathewson
2019-08-06Merge remote-tracking branch 'tor-github/pr/1203'Nick Mathewson
2019-08-06Merge branch 'ticket31343_035' into ticket31343_040Nick Mathewson
2019-08-06Merge branch 'ticket31343_029' into ticket31343_035Nick Mathewson
2019-08-06Avoid using labs() on time_t in channeltls.cNick Mathewson
2019-08-06Merge branch 'maint-0.4.1'Nick Mathewson
2019-08-06Merge branch 'ticket31311_041' into maint-0.4.1Nick Mathewson
2019-08-06practracker: Make it happy after rebaseDavid Goulet
2019-08-06hs-v3: Rename HS DoS default definesDavid Goulet
2019-08-06test: Series of fixes for hs_dos.c unit testsDavid Goulet
2019-08-06dos: Update HS intro circuits if parameters changeDavid Goulet
2019-08-06hs-v3: Add enable/disable HS DoS introduce parameterDavid Goulet
2019-08-06hs-v3: Add consensus parameters for DoS defensesDavid Goulet
2019-08-06test: Add hs_dos.c unit testsDavid Goulet
2019-08-06hs: Limit the amount of relayed INTRODUCE2David Goulet
2019-08-06Merge branch 'tor-github/pr/1195'George Kadianakis
2019-08-06Merge branch 'tor-github/pr/1193'David Goulet
2019-08-05#31320 Add IPv6 examplesAli Raheem
2019-08-05Rename handle_relay_command to handle_relay_cell_command .George Kadianakis
2019-08-05Test that regular cells get ignored in padding circuits.George Kadianakis
2019-08-05Ignore regular cells in padding circuits.George Kadianakis