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
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
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
Roger Dingledine
64f8e68e65
bump to 0.2.3.18-rc
2012-06-28 15:34:33 -04:00
Roger Dingledine
81cd3d7ad6
add a blurb for 0.2.3.18-rc, other minor cleanups
2012-06-28 15:32:36 -04:00
meejah
12298901fd
add new GETINFO config/defaults
...
returns the default values for every configuration item, similar
to GETINFO config/names; include a changes entry for it.
Fix for bug 4971
2012-06-28 15:15:51 -04:00
Roger Dingledine
dd7a27d17e
fix grammar in comment
2012-06-28 13:43:01 -04:00
Roger Dingledine
36d8a2535e
fold in more changes entries
2012-06-28 13:42:30 -04:00
Nick Mathewson
58eb3e405d
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-28 11:05:52 -04:00
Nick Mathewson
aad40483b3
Clean up check-spaces block; make it cover the right files
2012-06-28 11:04:52 -04:00
Nick Mathewson
96746e39f6
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-28 10:57:23 -04:00
Nick Mathewson
217862b317
Merge remote-tracking branch 'public/bug6244_part2' into maint-0.2.3
2012-06-28 10:49:32 -04:00
Nick Mathewson
d4a64fdc02
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-28 10:48:06 -04:00
Nick Mathewson
dc9dd2324b
Add version and bug number to 5238 changes file
2012-06-28 10:45:56 -04:00
Andrea Shepard
bdc8270280
Downgrade 'Got a certificate, but we already have it' log message from warning to info, except when we're a dirauth (fixes bug 5238)
2012-06-28 10:42:43 -04:00
Nick Mathewson
5a73df0217
Merge branch 'sscanf_squashed'
2012-06-28 09:59:36 -04:00
Nick Mathewson
d4285f03df
Extend tor_sscanf so it can replace sscanf in rephist.c
...
Fixes bug 4195 and Coverity CID 448
2012-06-28 09:54:05 -04:00
Nick Mathewson
28c42fe029
Fix GETINFO address-mappings/... with wildcarded addresses.
2012-06-27 23:55:01 -04:00
Nick Mathewson
e12eba55b2
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-27 23:45:59 -04:00
Nick Mathewson
23f2e37ff7
Allow wildcarded mapaddress targets in controller MAPADDRESS command
2012-06-27 23:38:04 -04:00
Roger Dingledine
0b3f5ca11f
merge changes files into upcoming changelog
2012-06-27 21:32:17 -04:00
Nick Mathewson
86197dfd4f
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-26 11:04:43 -04:00
Nick Mathewson
6330d2d9e6
Merge remote-tracking branch 'public/bug6227' into maint-0.2.3
2012-06-26 11:03:56 -04:00
Nick Mathewson
05dd0a9cd9
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-06-26 11:03:32 -04:00
Nick Mathewson
5fad3dc36b
Fix a warning when using glibc's strcspn with clang.
...
With glibc 2.15 and clang 3.0, I get warnings from where we use the
strcpsn implementation in the header as strcspn(string, "="). This
is apparently because clang sees that part of the strcspn macro
expands to "="[2], and doesn't realize that that part of the macro
is only evaluated when "="[1] != 0.
2012-06-26 11:02:44 -04:00