summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-11-16bump to 0.2.4.18-rctor-0.2.4.18-rcRoger Dingledine
2013-11-16fold in more changes entries, clean up changelogRoger Dingledine
2013-11-15Merge branch 'maint-0.2.4' into release-0.2.4Roger Dingledine
2013-11-15start to migrate recent changesRoger Dingledine
2013-11-15Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
Conflicts: src/or/or.h src/or/relay.c Conflicts were simple to resolve. More fixes were needed for compilation, including: reinstating the tv_to_msec function, and renaming *_conn_cells to *_chan_cells.
2013-11-15Merge branch 'bug9093_023' into maint-0.2.3Nick Mathewson
2013-11-11missing changes file for #10124Nick Mathewson
2013-11-10Merge branch 'maint-0.2.4' into release-0.2.4Roger Dingledine
2013-11-10Fix two more DirServer mentions in logNick Mathewson
2013-11-10Fix a wide lineNick Mathewson
2013-11-10Change documentation DirServer->DirAuthorityNick Mathewson
We renamed the option, but we didn't actually fix it in the log messages or the docs. This patch does that. For #10124. Patch by sqrt2.
2013-11-07Improved circuit queue out-of-memory handlerNick Mathewson
Previously, when we ran low on memory, we'd close whichever circuits had the most queued cells. Now, we close those that have the *oldest* queued cells, on the theory that those are most responsible for us running low on memory, and that those are the least likely to actually drain on their own if we wait a little longer. Based on analysis from a forthcoming paper by Jansen, Tschorsch, Johnson, and Scheuermann. Fixes bug 9093.
2013-11-02Merge branch 'maint-0.2.4' into release-0.2.4Roger Dingledine
2013-10-31Merge remote-tracking branch 'public/bug9645' into maint-0.2.4Nick Mathewson
2013-10-31Merge remote-tracking branch 'public/bug9731b' into maint-0.2.4Nick Mathewson
2013-10-31Merge remote-tracking branch 'public/bug9780_024_v2' into maint-0.2.4Nick Mathewson
2013-10-31Merge remote-tracking branch 'public/bug6055_v2_024' into maint-0.2.4Nick Mathewson
2013-10-17fold in changes entriesRoger Dingledine
2013-10-16Merge branch 'maint-0.2.4' into release-0.2.4Roger Dingledine
2013-10-12be willing to bootstrap from all three of our directory guardsRoger Dingledine
Also fix a bug where if the guard we choose first doesn't answer, we would try the second guard, but once we connected to the second guard we would abandon it and retry the first one, slowing down bootstrapping. The fix in both cases is to treat all our initially chosen guards as acceptable to use. Fixes bug 9946.
2013-10-11Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2013-10-11Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson
2013-10-11Update to the October 2013 GeoIP database.maint-0.2.2Karsten Loesing
2013-10-10in-progress release notes for the upcoming 0.2.4 stableRoger Dingledine
2013-10-10Merge branch 'maint-0.2.4' into release-0.2.4Roger Dingledine
2013-10-10rewrite history to improve two changelog entriesRoger Dingledine
2013-10-10Merge branch 'bug9644_024' into maint-0.2.4Nick Mathewson
2013-10-10Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2013-10-10Fix unit test for format_helper_exit_statusNick Mathewson
Fix format_helper_exit_status to allow full HEX_ERRNO_SIZE answers, *and* increase the buffer length again.
2013-10-10Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2013-10-10Merge remote-tracking branch 'public/bug9928' into maint-0.2.3Nick Mathewson
2013-10-09Partially revert "Clarify who learns about ContactInfo."Nick Mathewson
This reverts the torrc.sample.in changes from commit 66a04a6ac334775dc396025e0c15fa49eca138a7. We're going to not make this change in 0.2.4, since changing torrc.sample.in makes all the debian users do some pointless busywork. see tor-dev discusion of 9 Oct 2013.
2013-10-09Changes file for 9854Nick Mathewson
2013-10-09Clarify who learns about ContactInfo.Karsten Loesing
Explicitly include bridges, and note that we archive and publish all descriptors. (We are not yet publishing ContactInfo lines contained in bridge descriptors, but maybe we'll want to do that soon, so let's err on the side of caution here.) Related to #9854.
2013-10-08When examining interfaces to find an address, discard non-up ones.Nick Mathewson
Patch from "hantwister" on trac. Fixes bug #9904; bugfix on 0.2.3.11-alpha.
2013-10-08Switch ECDHE group default logic for bridge/relay TLSNick Mathewson
According to the manpage, bridges use P256 for conformity and relays use P224 for speed. But skruffy points out that we've gotten it backwards in the code. In this patch, we make the default P256 for everybody. Fixes bug 9780; bugfix on 0.2.4.8-alpha.
2013-10-08Changes file for 9866Nick Mathewson
2013-10-08Anchors for options (re#9866)Peter Palfrader
2013-10-08Merge remote-tracking branch 'public/bug9927' into maint-0.2.4Nick Mathewson
2013-10-08Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2013-10-08Merge remote-tracking branch 'public/bug9596' into maint-0.2.4Nick Mathewson
2013-10-08Give credit to bug reporter for 9928Nick Mathewson
2013-10-08Generate bootstrapping status messages for microdescs tooNick Mathewson
Fix for 9927.
2013-10-08Raise buffer size, fix checks for format_exit_helper_status.Nick Mathewson
This is probably not an exploitable bug, since you would need to have errno be a large negative value in the unix pluggable-transport launcher case. Still, best avoided. Fixes bug 9928; bugfix on 0.2.3.18-rc.
2013-10-02Merge branch 'bug9880_fix' into maint-0.2.4Nick Mathewson
2013-10-02Fix a bug in our bug 9776 fix.Nick Mathewson
By calling circuit_n_chan_done() unconditionally on close, we were closing pending connections that might not have been pending quite for the connection we were closing. Fix for bug 9880. Thanks to skruffy for finding this and explaining it patiently until we understood.
2013-09-30fold in changes entriesRoger Dingledine
2013-09-30Merge branch 'maint-0.2.4' into release-0.2.4Roger Dingledine
2013-09-25Re-enable TLS 1.[12] when building with OpenSSL >= 1.0.1eNick Mathewson
To fix #6033, we disabled TLS 1.1 and 1.2. Eventually, OpenSSL fixed the bug behind #6033. I've considered alternate implementations that do more testing to see if there's secretly an OpenSSL 1.0.1c or something that secretly has a backport of the OpenSSL 1.0.1e fix, and decided against it on the grounds of complexity.
2013-09-24Always call circuit_n_chan_done(chan, 0) from channel_closed()Andrea Shepard
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion