Nick Mathewson
f8c9cc713d
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-07-18 10:14:40 -04:00
Nick Mathewson
b355ddb20f
Merge branch 'smartlist_shorten' into maint-0.2.3
2012-07-18 10:14:14 -04:00
Nick Mathewson
78dec94307
Tweaks to 6400 changes file and docs as suggested by arma
2012-07-18 10:12:19 -04:00
Nick Mathewson
ec8bdc5da8
Merge remote-tracking branch 'asn/bug3589'
2012-07-17 12:05:08 -04:00
Nick Mathewson
f9478b7a79
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-07-17 12:03:10 -04:00
Nick Mathewson
4cac5df554
Improve message on spurious SOCKSListenAddress
2012-07-17 12:02:55 -04:00
Nick Mathewson
efdf6c7118
Fix the remaining instances of nexted SMARTLIST_FOREACH
2012-07-17 10:41:24 -04:00
Nick Mathewson
7faf115dff
Change all SMARTLIST_FOREACH loops of >=10 lines to use BEGIN/END
...
The SMARTLIST_FOREACH macro is more convenient than BEGIN/END when
you have a nice short loop body, but using it for long bodies makes
your preprocessor tell the compiler that all the code is on the same
line. That causes grief, since compiler warnings and debugger lines
will all refer to that one line.
So, here's a new style rule: SMARTLIST_FOREACH blocks need to be
short.
2012-07-17 10:34:08 -04:00
Nick Mathewson
0b6fb5ebcd
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-07-17 09:50:18 -04:00
Linus Nordberg
21c6c84853
Allow TestingTorNetwork when alternate dir and bridge authorities are set.
...
Allow TestingTorNetwork when AlternateDirAuthority and
AlternateBridgeAuthority is set even if DirServer is not.
2012-07-17 09:35:38 -04:00
Nick Mathewson
7ac8a4a037
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-07-16 11:50:53 -04:00
Nick Mathewson
93b7301755
Refer to the correct variable in a loop when parsing entry guard state
...
Fixes bug 6397 and coverity issue 709599. Bugfix on 0.2.3.17-beta.
2012-07-16 11:49:45 -04:00
Nick Mathewson
d32f5081e1
Coverity 709056: Check return value on fputs in tor-gencert
2012-07-16 11:38:39 -04:00
Nick Mathewson
deaf30a8af
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-07-16 11:22:41 -04:00
Nick Mathewson
9ad5b25930
Improve Alternate*Authority docs. Bug 6387.
2012-07-16 11:21:20 -04:00
George Kadianakis
8b9f4d75f2
Address Nick's comments.
...
- Add a changes/ file.
- Make it compile under --enable-gcc-warnings.
- Update the file-level documentation of src/or/transports.c.
- Only update descriptor if at least a managed proxy was configured.
- Add our external IP address to the extra-info descriptor instead of 0.0.0.0.
2012-07-12 15:28:43 +02:00
Roger Dingledine
6652477526
forward-port the 0.2.3.19-rc changelog
2012-07-07 04:59:39 -04:00
Roger Dingledine
6cad84503b
Merge branch 'maint-0.2.3'
2012-07-06 16:32:08 -04:00
Roger Dingledine
5ddb9b3134
Merge branch 'maint-0.2.2' into maint-0.2.3
2012-07-06 16:31:40 -04:00
Roger Dingledine
4e7552e552
Revert to the May 2012 geoip db
...
The June 2012 db marks too many relays as country "A1".
Addresses bug 6334.
2012-07-06 16:29:51 -04:00
Roger Dingledine
1fee920999
Merge branch 'maint-0.2.3'
2012-07-06 08:59:26 -04:00
Roger Dingledine
27ec0248d2
Merge remote-tracking branch 'nickm/bug6271_part_a' into maint-0.2.3
2012-07-06 08:57:29 -04:00
Nick Mathewson
7e1a0bb24e
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-07-06 08:03:16 -04:00
George Kadianakis
62c1311b3a
Fix port range in parse_port_range().
2012-07-06 08:02:14 -04:00
Nick Mathewson
419f541aa7
Fix a bug handling SENDME cells on nonexistent streams.
...
This could result in bizarre window values. Report and patch
contributed pseudymously. Fixes part of bug 6271. This bug was
introduced before the first Tor release, in svn commit r152.
(bug 6271, part a.)
2012-07-06 07:29:54 -04:00
Nick Mathewson
d30783ecbb
Fix compilation on 32-bit. Fix for bug 6277, not in any released tor.
2012-07-05 16:44:07 -04:00
Nick Mathewson
7e8d7a017e
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-07-05 05:08:54 -04:00
Nick Mathewson
e9b33ed1bf
On windows, ENOBUFS starts with WSA. #6296 . Fix on 0.2.18-rc
2012-07-05 05:01:00 -04:00
George Kadianakis
f8e49c5789
Change extra-info "method" to "transport".
2012-07-03 21:26:03 +03:00
George Kadianakis
ca4e986c1d
Mark descriptor as dirty if all managed proxies are configured.
2012-07-03 21:26:03 +03:00
George Kadianakis
9dea3a03b9
Add pluggable transport info to extra-info descriptors.
2012-07-03 21:26:03 +03:00
George Kadianakis
4bafe24400
Constify some functions.
2012-07-03 21:26:03 +03:00
George Kadianakis
17caec3676
Make some transports.c functions static.
...
- Also reorder functions.
2012-07-03 21:26:03 +03:00
George Kadianakis
aecc728a5a
Refactor mp->transports to use transport_t.
2012-07-03 21:26:03 +03:00
George Kadianakis
d11b772a6c
Introduce a transport_t deep copy function.
2012-07-03 21:26:03 +03:00
George Kadianakis
6173d36340
Move transport-related functions from circuitbuild.c to transports.c.
...
Move 'transport_t' to transports.h, and all transport-related
functions that don't rely on 'bridge_list' to transports.c.
2012-07-03 21:26:03 +03:00
Roger Dingledine
46434ecf5b
Merge branch 'maint-0.2.3'
2012-07-01 17:37:59 -04:00
Roger Dingledine
d13389b30e
Revert "Detect bug 6252 (unexpected sendme cell)"
...
This reverts commit c32ec9c425
.
It turns out the two sides of the circuit don't actually stay in sync,
so it is perfectly normal for the circuit window on the exit relay to
grow to 2000+. We should fix that bug and then reconsider this patch.
2012-07-01 17:36:35 -04:00
Roger Dingledine
6061cd584c
Merge branch 'maint-0.2.3'
2012-07-01 05:32:37 -04:00
Roger Dingledine
c32ec9c425
Detect bug 6252 (unexpected sendme cell)
...
I only check on circuits, not streams, since bloating your stream
window past the initial circuit window can't help you much.
Also, I compare to CIRCWINDOW_START_MAX so we don't have surprising
races if we lower CIRCWINDOW_START for an experiment.
2012-07-01 05:27:08 -04:00
Nick Mathewson
ed2601f2be
Merge branch 'bug6255'
2012-06-29 00:43:59 -04:00
Nick Mathewson
630677f339
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-29 00:38:30 -04:00
Nick Mathewson
6abdcdf116
Fix crash bug from 4a8eaad7
(Bug 6255)
...
We were doing a tor_strclear() on client_keys_str when it might not
even be set.
Fix for bug 6255; bug not in any release of Tor. Thanks to katmagic
for finding this one!
2012-06-29 00:32:27 -04:00
Nick Mathewson
da3edc4df0
Fix clang warning on d4285f03df
. Not in any released tor.
2012-06-29 00:22:57 -04:00
Nick Mathewson
9c5a118272
bump version to 0.2.3.18-rc-dev
2012-06-28 16:01:55 -04:00
Nick Mathewson
2f8a9e3502
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-28 15:53:14 -04:00
Nick Mathewson
19a81ef020
Merge commit '81cd3d7ad641a8dbf'
2012-06-28 15:52:57 -04:00
Nick Mathewson
e62ea8fd1e
oops; forgot the changes file for bug3842
2012-06-28 15:48:49 -04:00
Nick Mathewson
1e008e9876
Make check-spaces happy again
2012-06-28 15:40:08 -04:00
Brendan C
a6169800f8
Fix bug 3842: add a GETINFO signal/names
...
Also refactor SIGNAL so that it and signal/names use the same table.
(commit message by nickm)
2012-06-28 15:39:19 -04:00