summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-05fold in more changes entriesRoger Dingledine
2013-08-05Merge branch 'maint-0.2.4' into release-0.2.4Roger Dingledine
2013-08-05retroactively reformat a changelog stanzaRoger Dingledine
2013-07-31Merge remote-tracking branch 'arma/bug9354' into maint-0.2.4Nick Mathewson
2013-07-31Fix invalid-read when a managed proxy configuration fails.George Kadianakis
2013-07-30NumDirectoryGuards now tracks NumEntryGuards by defaultRoger Dingledine
Now a user who changes only NumEntryGuards will get the behavior she expects. Fixes bug 9354; bugfix on 0.2.4.8-alpha.
2013-07-28Merge branch 'maint-0.2.4' into release-0.2.4Roger Dingledine
2013-07-26Merge branch 'bug9337' into maint-0.2.4Nick Mathewson
2013-07-26Avoid assertion failure on unexepcted address family in DNS reply.Nick Mathewson
Fixes bug 9337; bugfix on 0.2.4.7-alpha.
2013-07-23Fix bug9309, and n_noncanonical count/continue codeNick Mathewson
When we moved channel_matches_target_addr_for_extend() into a separate function, its sense was inverted from what one might expect, and we didn't have a ! in one place where we should have. Found by skruffy.
2013-07-19fold in recent changes stanzasRoger Dingledine
2013-07-18Merge branch 'maint-0.2.4' into release-0.2.4Roger Dingledine
2013-07-18fix typoRoger Dingledine
2013-07-18Merge remote-tracking branch 'public/bug9295_023' into maint-0.2.4Nick Mathewson
2013-07-18Fix for bug 9295: Don't crash when running --hash-password.Nick Mathewson
Fix on 0.2.4.15-rc; I'm doing this branch against 0.2.3, since we're considering #9122 for an 0.2.3 backport, and if we do, we should merge this too.
2013-07-18tmpNick Mathewson
2013-07-16Re-do a cast in order to make old buggy freebsd gcc happyNick Mathewson
Fix for #9254. Bugfix on 0.2.4.14-alpha. This is not actually a bug in the Tor code.
2013-07-08Merge branch 'bug9200' into maint-0.2.4Nick Mathewson
2013-07-08Add a comment and a check for why flag indices will be <= 63Nick Mathewson
2013-07-08Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2013-07-08Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson
2013-07-08Update to the July 2013 GeoIP database.Karsten Loesing
2013-07-03FIx undefined behavior in dirvote.cNick Mathewson
Fix a bug in the voting algorithm that could yield incorrect results when a non-naming authority declared too many flags. Fixes bug 9200; bugfix on 0.2.0.3-alpha. Found by coverity scan.
2013-07-01bump to 0.2.4.15-rctor-0.2.4.15-rcRoger Dingledine
2013-07-01fold in changes entriesRoger Dingledine
2013-07-01Merge branch 'maint-0.2.4' into release-0.2.4Roger Dingledine
2013-06-29Merge branch 'bug9147' into maint-0.2.4Nick Mathewson
2013-06-29Give a warning when bufferevents are enabled.Nick Mathewson
Ticket 9147.
2013-06-24Fix bug 9122: don't allow newdefaultoptions to be NULLNick Mathewson
(This caused a crash that was reported as bug 9122, but the underlying behavior has been wrong for a while.) Fix on 0.2.3.9-alpha.
2013-06-18Oops; retroactively fix a character in the changelog. Roger will never notice.Nick Mathewson
2013-06-18Reformat changelog a little to follow arma rules on spacingtor-0.2.4.14-alphaNick Mathewson
2013-06-18Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4Nick Mathewson
2013-06-18Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2013-06-18Fix some problems with the bug9002 fix.Nick Mathewson
Fixes bug 9090; bug not in any released Tor.
2013-06-18Bump version to 0.2.4.14-alpha.Nick Mathewson
(Remember, this isn't a release until we tag it.)
2013-06-18Start on an 0.2.4.14-alpha changelogNick Mathewson
2013-06-18Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4Nick Mathewson
2013-06-18Tweak bug9063_redux patch: {n_p}_chan_cells, not {n,p}_conn_cellsNick Mathewson
2013-06-18Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
Conflicts: src/or/config.c src/or/relay.c
2013-06-18Merge branch 'bug9063_redux_023_squashed' into maint-0.2.3Nick Mathewson
2013-06-18Implement a real OOM-killer for too-long circuit queues.Nick Mathewson
This implements "algorithm 1" from my discussion of bug #9072: on OOM, find the circuits with the longest queues, and kill them. It's also a fix for #9063 -- without the side-effects of bug #9072. The memory bounds aren't perfect here, and you need to be sure to allow some slack for the rest of Tor's usage. This isn't a perfect fix; the rest of the solutions I describe on codeable.
2013-06-16Limit hidden service descriptors to at most 10 guard nodes.Nick Mathewson
Fixes bug 9002; bugfix on 0.1.1.11-alpha (which introduced guard nodes), or on 0.0.6pre1 (which introduced hidden services).
2013-06-15Merge branch 'bug9072-023' into bug9072-024Andrea Shepard
2013-06-15Disable middle relay queue overfill detection code due to possible guard ↵Andrea Shepard
discovery attack
2013-06-14bump to 0.2.4.13-alphator-0.2.4.13-alphaRoger Dingledine
2013-06-14fold in new changes filesRoger Dingledine
2013-06-14Merge branch 'maint-0.2.4' into release-0.2.4Roger Dingledine
2013-06-14Merge branch 'circuit_queue_cap-0.2.4-squashed' into maint-0.2.4Nick Mathewson
2013-06-14Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
Using "ours" strategy to avoid taking changes.
2013-06-14Merge branch 'circuit_queue_cap-0.2.3-squashed' into maint-0.2.3Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion