Commit Graph

17163 Commits

Author SHA1 Message Date
Roger Dingledine ce43072831 Merge branch 'maint-0.2.4' into release-0.2.4 2013-12-22 18:31:50 -05:00
Nick Mathewson 59a162f7d2 Merge branch 'bug10465' into maint-0.2.4 2013-12-22 17:20:22 -05:00
Nick Mathewson b9f6e40ecb Fix automapping to ipv6
Bugfix on 0.2.4.7-alpha; fixes bug 10465.
2013-12-22 17:19:22 -05:00
Roger Dingledine 9f7be021f3 bump to 0.2.4.20 2013-12-22 04:21:42 -05:00
Roger Dingledine 8eb617dca3 write the release blurb for 0.2.4.20, and give it a date 2013-12-22 04:11:03 -05:00
Roger Dingledine 00285acca3 fold in changes files so far 2013-12-22 02:35:20 -05:00
Roger Dingledine 2349833f71 Merge branch 'maint-0.2.4' into release-0.2.4 2013-12-22 02:25:53 -05:00
Nick Mathewson 2c956f0c99 Merge branch 'bug10456' into maint-0.2.4 2013-12-21 21:15:39 -05:00
Nick Mathewson b5d13d11c9 Fix a logic error in circuit_stream_is_being_handled.
When I introduced the unusable_for_new_circuits flag in
62fb209d83, I had a spurious ! in the
circuit_stream_is_being_handled loop.  This made us decide that
non-unusable circuits (that is, usable ones) were the ones to avoid,
and caused it to launch a bunch of extra circuits.

Fixes bug 10456; bugfix on 0.2.4.12-alpha.
2013-12-21 10:15:09 -05:00
Nick Mathewson dabdc339fe Merge branch 'bug10402_redux_024' into maint-0.2.4 2013-12-18 21:55:06 -05:00
Nick Mathewson 7b87003957 Never allow OpenSSL engines to replace the RAND_SSLeay method
This fixes bug 10402, where the rdrand engine would use the rdrand
instruction, not as an additional entropy source, but as a replacement
for the entire userspace PRNG.  That's obviously stupid: even if you
don't think that RDRAND is a likely security risk, the right response
to an alleged new alleged entropy source is never to throw away all
previously used entropy sources.

Thanks to coderman and rl1987 for diagnosing and tracking this down.
2013-12-18 11:53:07 -05:00
Nick Mathewson 561d9880f8 Merge branch 'bug10423' into maint-0.2.4 2013-12-17 13:53:11 -05:00
Nick Mathewson 3d5154550c Merge remote-tracking branch 'public/bug10409_023' into maint-0.2.4 2013-12-17 13:15:45 -05:00
Nick Mathewson 46b3b6208d Avoid double-free on failure to dump_descriptor() a cached md
This is a fix for 10423, which was introducd in caa0d15c in 0.2.4.13-alpha.

Spotted by bobnomnom.
2013-12-17 13:12:52 -05:00
Nick Mathewson d8cfa2ef4e Avoid free()ing from an mmap on corrupted microdesc cache
The 'body' field of a microdesc_t holds a strdup()'d value if the
microdesc's saved_location field is SAVED_IN_JOURNAL or
SAVED_NOWHERE, and holds a pointer to the middle of an mmap if the
microdesc is SAVED_IN_CACHE.  But we weren't setting that field
until a while after we parsed the microdescriptor, which left an
interval where microdesc_free() would try to free() the middle of
the mmap().

This patch also includes a regression test.

This is a fix for #10409; bugfix on 0.2.2.6-alpha.
2013-12-16 13:06:00 -05:00
Roger Dingledine e719d05fd2 minor clarity fixes tor-0.2.4.19 2013-12-10 15:57:31 -05:00
Roger Dingledine 7c3f1d29af bump to 0.2.4.19 2013-12-10 15:49:49 -05:00
Roger Dingledine f4c7d062f2 Add the dedication to Aaron. 2013-12-10 15:46:50 -05:00
Roger Dingledine 8377a5f6d7 write a blurb for 0.2.4.19 2013-11-22 00:57:30 -05:00
Roger Dingledine 1cda452bc1 bump to 0.2.4.18-rc tor-0.2.4.18-rc 2013-11-16 13:12:13 -05:00
Roger Dingledine 5f4748933d fold in more changes entries, clean up changelog 2013-11-16 13:07:58 -05:00
Roger Dingledine 5d1a004e0d Merge branch 'maint-0.2.4' into release-0.2.4 2013-11-15 17:10:31 -05:00
Roger Dingledine f503f30436 start to migrate recent changes 2013-11-15 17:08:45 -05:00
Nick Mathewson 59f50c80d4 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
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-15 15:29:24 -05:00
Nick Mathewson 9e90707602 Merge branch 'bug9093_023' into maint-0.2.3 2013-11-15 15:23:51 -05:00
Nick Mathewson a82b18f216 missing changes file for #10124 2013-11-11 10:49:44 -05:00
Roger Dingledine 6837a27025 Merge branch 'maint-0.2.4' into release-0.2.4 2013-11-10 21:51:31 -05:00
Nick Mathewson 8bfa596c15 Fix two more DirServer mentions in log 2013-11-10 12:23:56 -05:00
Nick Mathewson 56ac75b265 Fix a wide line 2013-11-10 12:22:34 -05:00
Nick Mathewson 532f70a807 Change documentation DirServer->DirAuthority
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-10 12:21:23 -05:00
Nick Mathewson 1b8ceb83c9 Improved circuit queue out-of-memory handler
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-07 12:15:30 -05:00
Roger Dingledine 33b86071b7 Merge branch 'maint-0.2.4' into release-0.2.4 2013-11-02 06:35:46 -04:00
Nick Mathewson 5cc155e02a Merge remote-tracking branch 'public/bug9645' into maint-0.2.4 2013-10-31 16:09:41 -04:00
Nick Mathewson db2c2a6909 Merge remote-tracking branch 'public/bug9731b' into maint-0.2.4 2013-10-31 14:08:28 -04:00
Nick Mathewson 1b312f7b55 Merge remote-tracking branch 'public/bug9780_024_v2' into maint-0.2.4 2013-10-31 14:02:28 -04:00
Nick Mathewson 0e8ee795d9 Merge remote-tracking branch 'public/bug6055_v2_024' into maint-0.2.4 2013-10-31 13:14:39 -04:00
Roger Dingledine 00f95c208e fold in changes entries 2013-10-17 02:51:06 -04:00
Roger Dingledine 7067f53d42 Merge branch 'maint-0.2.4' into release-0.2.4 2013-10-16 18:51:15 -04:00
Roger Dingledine 8f9fb63cdb be willing to bootstrap from all three of our directory guards
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-12 10:42:27 -04:00
Nick Mathewson 7ef2939e5a Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2013-10-11 11:16:59 -04:00
Nick Mathewson 82d8944928 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 2013-10-11 11:16:45 -04:00
Karsten Loesing 3b0265198f Update to the October 2013 GeoIP database. 2013-10-11 13:36:30 +02:00
Roger Dingledine fd35354441 in-progress release notes for the upcoming 0.2.4 stable 2013-10-10 21:43:50 -04:00
Roger Dingledine b9d11bd87c Merge branch 'maint-0.2.4' into release-0.2.4 2013-10-10 21:42:33 -04:00
Roger Dingledine eb5d75e96a rewrite history to improve two changelog entries 2013-10-10 21:17:19 -04:00
Nick Mathewson 2c7ed0406f Merge branch 'bug9644_024' into maint-0.2.4 2013-10-10 11:23:46 -04:00
Nick Mathewson 7b1b8c3694 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2013-10-10 11:18:07 -04:00
Nick Mathewson 004a9c6dd1 Fix unit test for format_helper_exit_status
Fix format_helper_exit_status to allow full HEX_ERRNO_SIZE answers,
*and* increase the buffer length again.
2013-10-10 11:15:35 -04:00
Nick Mathewson 1137817319 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2013-10-10 10:55:24 -04:00
Nick Mathewson 6eb7f2f889 Merge remote-tracking branch 'public/bug9928' into maint-0.2.3 2013-10-10 10:53:27 -04:00