summaryrefslogtreecommitdiff
path: root/changes
AgeCommit message (Collapse)Author
2019-08-09Merge branch 'bug31343_31374_035' into bug31343_31374_040teor
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-08Merge branch 'ticket31374_029' into ticket31374_035Nick Mathewson
2019-08-08Fix a warning about casting the results of GetProcAddress.Nick Mathewson
Fixes bug 31374; bugfix on 0.2.9.1-alpha.
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
Merge changed chutney and stem script lines from 29280 with changed stem script lines from 30591.
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-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
On some windows builds, time_t is 64 bits but long is not. This is causing appveyor builds to fail. Also, one of our uses of labs() on time_t was logically incorrect: it was telling us to accept NETINFO cells up to three minutes _before_ the message they were responding to, which doesn't make sense. This patch adds a time_abs() function that we should eventually move to intmath.h or something. For now, though, it will make merges easier to have it file-local in channeltls.c. Fixes bug 31343; bugfix on 0.2.4.4-alpha.
2019-07-01Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-07-01Merge branch 'maint-0.2.9' into maint-0.3.5Nick Mathewson
2019-07-01Merge branch 'chutney_ci_v4_035' into chutney_ci_v4_040teor
This merge removes an incorrect comment about the stem version and commit script.
2019-07-01Merge branch 'chutney_ci_v4_029' into chutney_ci_v4_035teor
2019-06-28changes: file for 28795teor
Replace the 157 fallbacks originally introduced in Tor 0.3.5.6-rc in December 2018 (of which ~122 were still functional), with a list of 148 fallbacks (70 new, 78 existing, 79 removed) generated in June 2019. Closes ticket 28795. Note that we created extra lists from DE and US, but they didn't add any more fallbacks when we tried to merge them.
2019-06-12Add a chutney mode to travis.yml.Nick Mathewson
2019-06-11Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-06-11Merge branch 'maint-0.2.9' into maint-0.3.5Nick Mathewson
2019-06-11Update geoip and geoip6 to the June 10 2019 database.Karsten Loesing
2019-06-11Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5teor
2019-06-11Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5teor
2019-06-11Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5teor
2019-06-11Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5teor
2019-06-11Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5teor
2019-06-10Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0Nick Mathewson
2019-06-10Merge branch 'bug30713_035' into bug30713_040teor
2019-06-10Travis: Skip test_rebind on macOS buildsteor
Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable is set. Skip test_rebind on macOS in Travis builds, because it is unreliable on macOS on Travis. Fixes bug 30713; bugfix on 0.3.5.1-alpha.
2019-06-10Travis: allow the test-stem job to failteor
Allow the test-stem job to fail in Travis, because it sometimes hangs. Fixes bug 30744; bugfix on 0.3.5.4-alpha.
2019-06-05Merge remote-tracking branch 'tor-github/pr/988' into maint-0.4.0Nick Mathewson
2019-06-05Merge remote-tracking branch 'tor-github/pr/989' into maint-0.4.0Nick Mathewson
2019-06-05Merge remote-tracking branch 'tor-github/pr/952' into maint-0.4.0Nick Mathewson
2019-06-05Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.4.0Nick Mathewson
2019-06-05Merge remote-tracking branch 'tor-github/pr/971' into maint-0.4.0Nick Mathewson
2019-06-05Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.4.0Nick Mathewson
2019-05-30Travis: only run the stem tests that use a tor binaryteor
Closes ticket 30694.
2019-05-29Merge branch 'tor-github/pr/924' into maint-0.4.0George Kadianakis
2019-05-28Travis: make stem log a controller trace, and tail stem's tor logteor
In Travis, make stem log a controller trace to the console. And tail stem's tor log after failure. Closes ticket 30591.
2019-05-22Merge remote-tracking branch 'nickm/ticket30454_034_01_squashed' into ↵David Goulet
ticket30454_035_01
2019-05-20hs: Add changes file for #30454David Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-05-17Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
2019-05-17Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-05-17Merge branch 'maint-0.2.9' into maint-0.3.4maint-0.3.4Nick Mathewson
2019-05-17Update geoip and geoip6 to the May 13 2019 database.Karsten Loesing
2019-05-15Merge branch 'tor-github/pr/1013' into maint-0.4.0George Kadianakis
2019-05-14Add a --list-modules commandNick Mathewson
Closes ticket 30452.