summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-11-16Fold in the 27471 changelog entrytor-0.3.5.5-alphaNick Mathewson
2018-11-16Merge branch 'maint-0.3.5' into release-0.3.5Nick Mathewson
2018-11-16Merge remote-tracking branch 'dgoulet/ticket27471_035_02' into maint-0.3.5Nick Mathewson
2018-11-16Merge branch 'maint-0.3.5' into release-0.3.5Nick Mathewson
2018-11-16Bump to 0.3.5.5-alphaNick Mathewson
2018-11-16start changelog for 0.3.5.5-alphaNick Mathewson
2018-11-15Merge branch 'maint-0.3.5' into release-0.3.5Nick Mathewson
2018-11-15Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
"ours" merge to avoid taking 25573 and 27686 again.
2018-11-15Merge remote-tracking branch 'public/ticket27686_034' into maint-0.3.4Nick Mathewson
2018-11-15Merge branch 'bug25573-034-typefix' into maint-0.3.4Nick Mathewson
2018-11-15Merge branch 'maint-0.3.5' into release-0.3.5Nick Mathewson
2018-11-15Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
"ours" merge to avoid duplicating conflict resolution in merge of 24104
2018-11-15Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-11-15Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-11-15Merge branch 'maint-0.3.5' into release-0.3.5Nick Mathewson
2018-11-15Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
2018-11-15Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-11-15Merge branch 'bug26913_033' into maint-0.3.3Nick Mathewson
2018-11-15Merge remote-tracking branch 'public/bug24104_029_squashed' into maint-0.2.9Nick Mathewson
Resolved conflicts with the 26269 fix in 015fcd0e1191aa6f.
2018-11-15Merge branch 'maint-0.3.5' into release-0.3.5Nick Mathewson
2018-11-15Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
"ours" merge to avoid the 0.3.3 version of #27550.
2018-11-15Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-11-15Merge remote-tracking branch 'dgoulet/bug27550_033_01' into maint-0.3.3Nick Mathewson
2018-11-15Merge branch 'maint-0.3.5' into release-0.3.5Nick Mathewson
2018-11-15Merge branch 'bug27740_035_fix' into maint-0.3.5Nick Mathewson
2018-11-15Merge branch 'maint-0.3.5' into release-0.3.5Nick Mathewson
2018-11-15Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
2018-11-15Appveyor: add comments to the config fileteor
Documentation for 28399, 28454, and previous fixes.
2018-11-15Appveyor: manually add zstd flags to configureteor
The mingw zstd from MSYS2 doesn't come with a pkg-config file. Fixes 28454 on Tor 0.3.4.1-alpha.
2018-11-15Appveyor: remove incorrect OpenSSL pathteor
Fixes 28399 on 0.3.4.1-alpha.
2018-11-15Appveyor: Improve diagnosticsteor
Stop installing MSYS2 packages. We're compiling for mingw, so we only need mingw packages. Run pacman in verbose mode. Explicitly install pkg-config and xz, to future-proof our builds. Diagnostics for 28399.
2018-11-14Merge branch 'maint-0.3.5' into release-0.3.5Nick Mathewson
2018-11-14Merge branch 'ticket27750_034_01_squashed' into maint-0.3.5Nick Mathewson
2018-11-14conn: Close the read side of a closing connection when write limit is reachedDavid Goulet
In conn_close_if_marked(), we can decide to keep a connection open that still has data to flush on the wire if it is being rate limited on the write side. However, in this process, we were also looking at the read() side which can still have token in its bucket and thus not stop the reading. This lead to a BUG() introduced in 0.3.4.1-alpha that was expecting the read side to be closed due to the rate limit but which only applies on the write side. This commit removes any bandwidth check on the read side and simply stop the read side on the connection regardless of the bucket state. If we keep the connection open to flush it out before close, we should not read anything. Fixes #27750 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-11-14Merge branch 'maint-0.3.5' into release-0.3.5Nick Mathewson
2018-11-14Merge remote-tracking branch 'teor/bug28441-035' into maint-0.3.5Nick Mathewson
2018-11-14Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-11-14Merge branch 'maint-0.3.5' into release-0.3.5Nick Mathewson
2018-11-14Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
2018-11-14Work around check-spaces.Nick Mathewson
2018-11-14Changes file for bug 28419Nick Mathewson
2018-11-14libtorrunner: fix memory leak in child() error pathMartin Kepplinger
This avoids leaking memory in case libtorrunner's child() function fails.
2018-11-14Merge branch 'maint-0.3.5' into release-0.3.5Nick Mathewson
2018-11-14Fix Doxyfile for 0.3.5 source tree movesTaylor Yu
Make Doxygen work again after the 0.3.5 source tree moves. Fixes bug 28435; bugfix on 0.3.5.1-alpha.
2018-11-14Merge branch 'maint-0.3.5' into release-0.3.5Nick Mathewson
2018-11-14log: stop talking about the Named flag in log messagesteor
Clients have ignored the Named flag since 0.3.2. Fixes bug 28441; bugfix on 0.3.2.1-alpha.
2018-11-14comment: circuit_list_path_impl() does not check Named any moreteor
2018-11-14comment: Fix a typo in nodes_in_same_family()teor
2018-11-14doc: Remove an outdated sentence from KeepalivePeriod in the man pageteor
2018-11-13Merge branch 'maint-0.3.5' into release-0.3.5Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion