aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Bump version to Tor 0.2.3.10-alphaNick Mathewson2011-12-15
|
* Changelog and blurb for 0.2.3.10-alphaNick Mathewson2011-12-15
|
* Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-12-15
|\
| * Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-12-15
| |\
| | * Add a fix for the buf_pullup bug that Vektor reportedNick Mathewson2011-12-15
| | |
* | | Start a section for the 0.2.3.10-alpha changelogNick Mathewson2011-12-14
| | |
* | | Don't crash on startup of a dormant relayRobert Ransom2011-12-12
| | | | | | | | | | | | | | | | | | If a relay is dormant at startup, it will call init_keys before crypto_set_tls_dh_prime. This is bad. Let's make it not so bad, because someday it *will* happen again.
* | | Fix compilation of natpmp-helper on non-windowsSebastian Hahn2011-12-10
| | | | | | | | | | | | Fixes a small oversight in 5dbfb1b3e0efc95be34ba7d69852511c9bac1f4b.
* | | Merge branch 'bug4655-squashed'Nick Mathewson2011-12-09
|\ \ \
| * | | Remove comment complaining that we try to attach all streams to circsRobert Ransom2011-12-09
| | | | | | | | | | | | | | | | | | | | | | | | It's inefficient, but the more efficient solution (only try to attach streams aiming for this HS) would require far more complexity for a gain that should be tiny.
| * | | Clear stream-isolation state on rend circs if needed to attach streamsRobert Ransom2011-12-09
| | | | | | | | | | | | | | | | Fixes bug 4655; bugfix on 0.2.3.3-alpha.
| * | | Refactor stream attachment in circuit_has_openedRobert Ransom2011-12-09
|/ / / | | | | | | | | | | | | Put the 'try attaching streams, clear isolation state if possible, retry attaching streams' loop in its own separate function, where it belongs.
* | | bump to 0.2.3.9-alpha-devRoger Dingledine2011-12-08
| | |
* | | give 0.2.3.9-alpha a blurbRoger Dingledine2011-12-08
| | |
* | | bump to 0.2.3.9-alphaRoger Dingledine2011-12-08
| | |
* | | Merge remote-tracking branch 'sebastian/bug4672'Roger Dingledine2011-12-08
|\ \ \
| * | | Some more check-spaces stuffSebastian Hahn2011-12-08
| | | | | | | | | | | | | | | | | | | | | | | | This re-applies a check-spaces fix that was part of 7920ea55b8d994268d2b07f27316b0f34d8f27e5 and got reverted along with the rest of that commit in df1f72329acf5f555618a5309f2621e584c0d763.
| * | | indent; add commentNick Mathewson2011-12-08
| | | | | | | | | | | | | | | | | | | | | | | | This re-applies 40a87c4c08be0cdd87a3df283f285b3c2a0c8445 which got accidentally reverted in 75134c6c86e54c10fd9e11c4345aadcdabc0f8fb. Thanks asn for spotting this.
| * | | appease check-spacesSebastian Hahn2011-12-08
| | | | | | | | | | | | | | | | | | | | | | | | This re-applies f77f9bddb8bf0dd6e9c3e0d94269aa23f459a272 which got accidentally reverted in 53f535aeb863204470379b2da4631770fa10b13f. Thanks asn for spotting this.
* | | | paint bug2474's fix a different neon colorRoger Dingledine2011-12-08
| | | | | | | | | | | | | | | | this way people with 80-column logs may read more of the warning
* | | | Merge branch 'maint-0.2.2'Roger Dingledine2011-12-08
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2011-12-08
| |\ \ \ | | | |/ | | |/|
| | * | Update to the December 2011 GeoIP database.Karsten Loesing2011-12-08
| | | |
* | | | fold in changes filesRoger Dingledine2011-12-08
| |_|/ |/| |
* | | Remove 4312 from the changelog.Nick Mathewson2011-12-07
| | |
* | | Merge remote-tracking branch 'public/revert_4312'Nick Mathewson2011-12-07
|\ \ \
| * | | Revert "Refactor the SSL_set_info_callback() callbacks."Nick Mathewson2011-12-06
| | | | | | | | | | | | | | | | This reverts commit 69a821ea1c9357acdd5aa1c9e23fd030b01cb5a9.
| * | | Revert "Detect renegotiation when it actually happens."Nick Mathewson2011-12-06
| | | | | | | | | | | | | | | | This reverts commit 4fd79f9def28996552b5739792f428c2514de1f6.
| * | | Revert "Detect and deny excess renegotiations attempts."Nick Mathewson2011-12-06
| | | | | | | | | | | | | | | | This reverts commit ecd239e3b577705e0669d47293a2e755cf93cec0.
| * | | Revert "Get rid of tor_tls_block_renegotiation()."Nick Mathewson2011-12-06
| | | | | | | | | | | | | | | | This reverts commit 340809dd224b244675496e301d3ba154a6fe68d0.
| * | | Revert "Also handle needless renegotiations in SSL_write()."Nick Mathewson2011-12-06
| | | | | | | | | | | | | | | | This reverts commit e2b3527106e0747f652e2f28fa087d9874e0e2ce.
| * | | Revert "Fix issues pointed out by nickm."Nick Mathewson2011-12-06
| | | | | | | | | | | | | | | | This reverts commit e097bffaed72af6b19f7293722021196bb94de1e.
| * | | Revert "Use callback-driven approach to block renegotiations."Nick Mathewson2011-12-06
| | | | | | | | | | | | | | | | This reverts commit 406ae1ba5ad529a4d0e710229dab6ed645d42b50.
| * | | Revert "appease check-spaces"Nick Mathewson2011-12-06
| | | | | | | | | | | | | | | | This reverts commit f77f9bddb8bf0dd6e9c3e0d94269aa23f459a272.
| * | | Revert "Refactor tor_event_base_once to do what we actually want"Nick Mathewson2011-12-06
| | | | | | | | | | | | | | | | This reverts commit 7920ea55b8d994268d2b07f27316b0f34d8f27e5.
| * | | Revert "Avoid a double-mark in connection_or_close_connection_cb"Nick Mathewson2011-12-06
| | | | | | | | | | | | | | | | This reverts commit 633071eb3bcf2c4106e93de28d727594bd23b1db.
| * | | Revert "Fix some wide lines in tortls.c"Nick Mathewson2011-12-06
| | | | | | | | | | | | | | | | This reverts commit e8dde3aabd3e1292d381eb4269c6457548dca6b9.
| * | | Revert "use event_free() wrapper; fix bug 4582"Nick Mathewson2011-12-06
| | | | | | | | | | | | | | | | This reverts commit 9a88c0cd32df53116a6bbb6b961650943755061c.
| * | | Revert "Don't schedule excess_renegotiations_callback unless it's set"Nick Mathewson2011-12-06
| | | | | | | | | | | | | | | | This reverts commit 617617e21a2d30a86cea9c8f7043333078f2e8f8.
| * | | Revert "indent; add comment"Nick Mathewson2011-12-06
| | | | | | | | | | | | | | | | This reverts commit 40a87c4c08be0cdd87a3df283f285b3c2a0c8445.
| * | | Revert "Make pending libevent actions cancelable"Nick Mathewson2011-12-06
| | | | | | | | | | | | | | | | This reverts commit aba25a6939a5907d40dbcff7433a8c130ffd12ad.
| * | | Revert "Set renegotiation callbacks immediately on tls inititation"Nick Mathewson2011-12-06
| | | | | | | | | | | | | | | | This reverts commit e27a26d568a257cf350814a9abfa47d3b41ad9f3.
* | | | clarify a debug lineRoger Dingledine2011-12-07
| | | |
* | | | Add changes file for feature2553Robert Ransom2011-12-07
|/ / /
* | | Merge remote-tracking branch 'sebastian/coverity'Nick Mathewson2011-12-05
|\ \ \
| * | | cid 432: Remove dead code if we don't handle a consensusSebastian Hahn2011-12-04
| | | | | | | | | | | | | | | | Bugfix on 0.2.3.1, fixes the second half of bug 4637.
* | | | Add comment about bug4651 fixNick Mathewson2011-12-05
| | | |
* | | | Don't send two ESTABLISH_RENDEZVOUS cells when opening a new rend circRobert Ransom2011-12-03
|/ / /
* | | Don't just tell the controller "foo" on id mismatchNick Mathewson2011-12-02
| | | | | | | | | | | | Fixes bug 4169; bugfix on 0.2.1.1-alpha.
* | | Init conn->addr to "unspec" on cpuworker connectionsNick Mathewson2011-12-02
| | | | | | | | | | | | Fixes bug 4532 reported by "troll_un"