summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-08-09Merge remote-tracking branch 'tor-github/pr/920' into maint-0.3.5teor
2019-08-09Fix #28525 changes file that is breaking CI.George Kadianakis
2019-08-09Fix #28525 changes file that is breaking CI.George Kadianakis
2019-08-09Merge remote-tracking branch 'tor-github/pr/763' into maint-0.3.5teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/762' into maint-0.2.9teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/958' into maint-0.3.5teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/957' into maint-0.2.9teor
2019-08-09Merge branch 'bug31343_31374_040' into bug31343_31374_041teor
2019-08-09Merge branch 'bug31343_31374_035' into bug31343_31374_040teor
2019-08-09Merge branch 'bug31343_31374_029' into bug31343_31374_035teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/1211' into test31343_040teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/1222' into combined31343_31374_035teor
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' into release-0.4.1Nick Mathewson
2019-08-08Merge branch 'ticket31374_035' into maint-0.4.1Nick Mathewson
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' into release-0.4.1Nick 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' into release-0.4.1teor
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' into release-0.4.1teor
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-07releasenotes: coalesce some sections.Nick Mathewson
2019-08-07Remove 0.4.1.x bugfixes from 0.4.1 releasenotesNick Mathewson
2019-08-07start on changelog and releasenotes for 0.4.1.5Nick 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' into release-0.4.1Nick Mathewson
2019-08-06Merge branch 'ticket31311_041' into maint-0.4.1Nick Mathewson
2019-08-05Merge branch 'maint-0.4.1' into release-0.4.1Nick Mathewson
2019-08-05Ignore regular cells in padding circuits.George Kadianakis
2019-08-01make dist: only include files from practracker dir intentionally.Nick Mathewson
2019-07-29Merge branch 'maint-0.4.1' into release-0.4.1David Goulet