summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2011-12-15Bump version to Tor 0.2.3.10-alphator-0.2.3.10-alphaNick Mathewson
2011-12-15Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-12-15Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-12-15Add a fix for the buf_pullup bug that Vektor reportedNick Mathewson
2011-12-12Don't crash on startup of a dormant relayRobert Ransom
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.
2011-12-10Fix compilation of natpmp-helper on non-windowsSebastian Hahn
Fixes a small oversight in 5dbfb1b3e0efc95be34ba7d69852511c9bac1f4b.
2011-12-09Remove comment complaining that we try to attach all streams to circsRobert Ransom
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.
2011-12-09Clear stream-isolation state on rend circs if needed to attach streamsRobert Ransom
Fixes bug 4655; bugfix on 0.2.3.3-alpha.
2011-12-09Refactor stream attachment in circuit_has_openedRobert Ransom
Put the 'try attaching streams, clear isolation state if possible, retry attaching streams' loop in its own separate function, where it belongs.
2011-12-08bump to 0.2.3.9-alpha-devRoger Dingledine
2011-12-08bump to 0.2.3.9-alphaRoger Dingledine
2011-12-08Merge remote-tracking branch 'sebastian/bug4672'Roger Dingledine
2011-12-08paint bug2474's fix a different neon colorRoger Dingledine
this way people with 80-column logs may read more of the warning
2011-12-08Merge branch 'maint-0.2.2'Roger Dingledine
2011-12-08Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine
2011-12-08Update to the December 2011 GeoIP database.Karsten Loesing
2011-12-08Some more check-spaces stuffSebastian Hahn
This re-applies a check-spaces fix that was part of 7920ea55b8d994268d2b07f27316b0f34d8f27e5 and got reverted along with the rest of that commit in df1f72329acf5f555618a5309f2621e584c0d763.
2011-12-08indent; add commentNick Mathewson
This re-applies 40a87c4c08be0cdd87a3df283f285b3c2a0c8445 which got accidentally reverted in 75134c6c86e54c10fd9e11c4345aadcdabc0f8fb. Thanks asn for spotting this.
2011-12-08appease check-spacesSebastian Hahn
This re-applies f77f9bddb8bf0dd6e9c3e0d94269aa23f459a272 which got accidentally reverted in 53f535aeb863204470379b2da4631770fa10b13f. Thanks asn for spotting this.
2011-12-07Merge remote-tracking branch 'public/revert_4312'Nick Mathewson
2011-12-07clarify a debug lineRoger Dingledine
2011-12-06Revert "Refactor the SSL_set_info_callback() callbacks."Nick Mathewson
This reverts commit 69a821ea1c9357acdd5aa1c9e23fd030b01cb5a9.
2011-12-06Revert "Detect renegotiation when it actually happens."Nick Mathewson
This reverts commit 4fd79f9def28996552b5739792f428c2514de1f6.
2011-12-06Revert "Detect and deny excess renegotiations attempts."Nick Mathewson
This reverts commit ecd239e3b577705e0669d47293a2e755cf93cec0.
2011-12-06Revert "Get rid of tor_tls_block_renegotiation()."Nick Mathewson
This reverts commit 340809dd224b244675496e301d3ba154a6fe68d0.
2011-12-06Revert "Also handle needless renegotiations in SSL_write()."Nick Mathewson
This reverts commit e2b3527106e0747f652e2f28fa087d9874e0e2ce.
2011-12-06Revert "Fix issues pointed out by nickm."Nick Mathewson
This reverts commit e097bffaed72af6b19f7293722021196bb94de1e.
2011-12-06Revert "Use callback-driven approach to block renegotiations."Nick Mathewson
This reverts commit 406ae1ba5ad529a4d0e710229dab6ed645d42b50.
2011-12-06Revert "appease check-spaces"Nick Mathewson
This reverts commit f77f9bddb8bf0dd6e9c3e0d94269aa23f459a272.
2011-12-06Revert "Refactor tor_event_base_once to do what we actually want"Nick Mathewson
This reverts commit 7920ea55b8d994268d2b07f27316b0f34d8f27e5.
2011-12-06Revert "Avoid a double-mark in connection_or_close_connection_cb"Nick Mathewson
This reverts commit 633071eb3bcf2c4106e93de28d727594bd23b1db.
2011-12-06Revert "Fix some wide lines in tortls.c"Nick Mathewson
This reverts commit e8dde3aabd3e1292d381eb4269c6457548dca6b9.
2011-12-06Revert "use event_free() wrapper; fix bug 4582"Nick Mathewson
This reverts commit 9a88c0cd32df53116a6bbb6b961650943755061c.
2011-12-06Revert "Don't schedule excess_renegotiations_callback unless it's set"Nick Mathewson
This reverts commit 617617e21a2d30a86cea9c8f7043333078f2e8f8.
2011-12-06Revert "indent; add comment"Nick Mathewson
This reverts commit 40a87c4c08be0cdd87a3df283f285b3c2a0c8445.
2011-12-06Revert "Make pending libevent actions cancelable"Nick Mathewson
This reverts commit aba25a6939a5907d40dbcff7433a8c130ffd12ad.
2011-12-06Revert "Set renegotiation callbacks immediately on tls inititation"Nick Mathewson
This reverts commit e27a26d568a257cf350814a9abfa47d3b41ad9f3.
2011-12-05Merge remote-tracking branch 'sebastian/coverity'Nick Mathewson
2011-12-05Add comment about bug4651 fixNick Mathewson
2011-12-04cid 432: Remove dead code if we don't handle a consensusSebastian Hahn
Bugfix on 0.2.3.1, fixes the second half of bug 4637.
2011-12-03Don't send two ESTABLISH_RENDEZVOUS cells when opening a new rend circRobert Ransom
2011-12-02Don't just tell the controller "foo" on id mismatchNick Mathewson
Fixes bug 4169; bugfix on 0.2.1.1-alpha.
2011-12-02Init conn->addr to "unspec" on cpuworker connectionsNick Mathewson
Fixes bug 4532 reported by "troll_un"
2011-12-02Don't call tor_tls_set_logged_address till after checking conn->tlsNick Mathewson
Fixes bug 4531; partial backport of e27a26d5.
2011-12-02Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-12-02tor_accept_socket() should take tor_addr_t for listener argNick Mathewson
Fixes bug 4535; bugfix on 0.2.2.28-beta; found by "troll_un"
2011-12-02Give DirAllowPrivateAddress an explicit defaultNick Mathewson
By convention, we say whether each bool's default is 0 or 1 Fixes 4536; found by "troll_un"
2011-12-02Resolve bug 3448: remove mention of tor-ops (which is not in use)Nick Mathewson
2011-12-02Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-12-02Fix bug 4530; check return val of tor_addr_lookup correctlyNick Mathewson
Fix on 0.2.1.5-alpha; reported by troll_un
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion