Commit Graph

17031 Commits

Author SHA1 Message Date
Roger Dingledine 889e9bd529 bump to 0.2.4.16-rc tor-0.2.4.16-rc 2013-08-10 18:17:43 -04:00
Roger Dingledine addbe6f2f3 give it a blurb and a date 2013-08-10 18:06:03 -04:00
Roger Dingledine c2150628fd fold in change stanza 2013-08-10 18:04:17 -04:00
Roger Dingledine 42335972d5 Merge branch 'maint-0.2.4' into release-0.2.4 2013-08-10 18:00:47 -04:00
Nick Mathewson d5cfbf96a2 Fix an uninitialized-read when parsing v3 introduction requests.
Fortunately, later checks mean that uninitialized data can't get sent
to the network by this bug.  Unfortunately, reading uninitialized heap
*can* (in some cases, with some allocators) cause a crash if you get
unlucky and go off the end of a page.

Found by asn.  Bugfix on 0.2.4.1-alpha.
2013-08-10 17:49:51 -04:00
Roger Dingledine a2ea9df498 fold in more changes entries 2013-08-05 12:06:09 -04:00
Roger Dingledine 27fbfbbe7c Merge branch 'maint-0.2.4' into release-0.2.4 2013-08-05 02:49:40 -04:00
Roger Dingledine f473dec1e0 retroactively reformat a changelog stanza 2013-08-05 02:36:49 -04:00
Nick Mathewson 0a0f93d277 Merge remote-tracking branch 'arma/bug9354' into maint-0.2.4 2013-07-31 21:48:48 -04:00
George Kadianakis 5a5147dd2e Fix invalid-read when a managed proxy configuration fails. 2013-07-31 13:56:07 -04:00
Roger Dingledine ff6bb13c02 NumDirectoryGuards now tracks NumEntryGuards by default
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-30 12:05:39 -04:00
Roger Dingledine 4a1d9726f4 Merge branch 'maint-0.2.4' into release-0.2.4 2013-07-28 09:50:19 -04:00
Nick Mathewson 8d0fb3a434 Merge branch 'bug9337' into maint-0.2.4 2013-07-26 15:41:35 +02:00
Nick Mathewson 11f1b7d9df Avoid assertion failure on unexepcted address family in DNS reply.
Fixes bug 9337; bugfix on 0.2.4.7-alpha.
2013-07-26 15:33:46 +02:00
Nick Mathewson 1d2e8020b7 Fix bug9309, and n_noncanonical count/continue code
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-23 11:52:10 +02:00
Roger Dingledine 2b9fb51ac6 fold in recent changes stanzas 2013-07-19 00:15:54 -04:00
Roger Dingledine bc6c7ea74e Merge branch 'maint-0.2.4' into release-0.2.4 2013-07-18 23:36:05 -04:00
Roger Dingledine 0eca8737a1 fix typo 2013-07-18 23:35:20 -04:00
Nick Mathewson 17a960734a Merge remote-tracking branch 'public/bug9295_023' into maint-0.2.4 2013-07-18 23:17:05 -04:00
Nick Mathewson e9c2484311 Fix for bug 9295: Don't crash when running --hash-password.
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-18 23:15:46 -04:00
Nick Mathewson 5977435629 tmp 2013-07-18 23:08:36 -04:00
Nick Mathewson c36bdbd535 Re-do a cast in order to make old buggy freebsd gcc happy
Fix for #9254.  Bugfix on 0.2.4.14-alpha.

This is not actually a bug in the Tor code.
2013-07-16 14:48:12 -04:00
Nick Mathewson 7a4145c45a Merge branch 'bug9200' into maint-0.2.4 2013-07-08 11:35:25 -04:00
Nick Mathewson b34279d3ab Add a comment and a check for why flag indices will be <= 63 2013-07-08 11:35:06 -04:00
Nick Mathewson c78c8de015 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2013-07-08 09:22:49 -04:00
Nick Mathewson 0b9c515870 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 2013-07-08 09:22:00 -04:00
Karsten Loesing 2a61b0dd6b Update to the July 2013 GeoIP database. 2013-07-08 10:21:28 +02:00
Nick Mathewson 15cd79f832 FIx undefined behavior in dirvote.c
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-03 12:01:37 -04:00
Roger Dingledine e7b435872c bump to 0.2.4.15-rc tor-0.2.4.15-rc 2013-07-01 16:39:39 -04:00
Roger Dingledine 8b8e3476c0 fold in changes entries 2013-07-01 15:29:51 -04:00
Roger Dingledine e9f0cdf55f Merge branch 'maint-0.2.4' into release-0.2.4 2013-07-01 15:08:57 -04:00
Nick Mathewson 81a5ee77ec Merge branch 'bug9147' into maint-0.2.4 2013-06-29 03:50:37 -04:00
Nick Mathewson c955149271 Give a warning when bufferevents are enabled.
Ticket 9147.
2013-06-29 03:45:40 -04:00
Nick Mathewson ca6aacce16 Fix bug 9122: don't allow newdefaultoptions to be NULL
(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-24 12:53:37 -04:00
Nick Mathewson 7b29838891 Oops; retroactively fix a character in the changelog. Roger will never notice. 2013-06-18 16:25:03 -04:00
Nick Mathewson f5729b8c1d Reformat changelog a little to follow arma rules on spacing tor-0.2.4.14-alpha 2013-06-18 15:06:21 -04:00
Nick Mathewson cee6a991d2 Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4 2013-06-18 14:46:25 -04:00
Nick Mathewson 7c4544e5a4 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2013-06-18 14:45:29 -04:00
Nick Mathewson 60d633c73a Fix some problems with the bug9002 fix.
Fixes bug 9090; bug not in any released Tor.
2013-06-18 11:54:57 -04:00
Nick Mathewson fd9ba5ed56 Bump version to 0.2.4.14-alpha.
(Remember, this isn't a release until we tag it.)
2013-06-18 10:40:18 -04:00
Nick Mathewson ce168e7800 Start on an 0.2.4.14-alpha changelog 2013-06-18 10:33:14 -04:00
Nick Mathewson 4a9ccb5d59 Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4 2013-06-18 10:28:43 -04:00
Nick Mathewson efa342f5fa Tweak bug9063_redux patch: {n_p}_chan_cells, not {n,p}_conn_cells 2013-06-18 10:25:10 -04:00
Nick Mathewson d3063da691 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Conflicts:
	src/or/config.c
	src/or/relay.c
2013-06-18 10:23:03 -04:00
Nick Mathewson c37fdc2eef Merge branch 'bug9063_redux_023_squashed' into maint-0.2.3 2013-06-18 10:16:47 -04:00
Nick Mathewson 2e1fe1fcf9 Implement a real OOM-killer for too-long circuit queues.
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-18 10:15:16 -04:00
Nick Mathewson dc516a5436 Limit hidden service descriptors to at most 10 guard nodes.
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-16 20:24:48 -04:00
Andrea Shepard 9e45d940d4 Merge branch 'bug9072-023' into bug9072-024 2013-06-15 02:20:19 -07:00
Andrea Shepard 2a95f31716 Disable middle relay queue overfill detection code due to possible guard discovery attack 2013-06-15 02:16:00 -07:00
Roger Dingledine dcb4f22506 bump to 0.2.4.13-alpha tor-0.2.4.13-alpha 2013-06-14 18:27:38 -04:00