Andreas Stieger
f31ba6a356
openSUSE initscript create /var/run/tor fixes Ticket #2573
...
(changes file added by nickm)
2011-03-09 16:18:44 -05:00
Roger Dingledine
b5f2b449ee
forward-port the 0.2.2.23-alpha changelog
2011-03-08 18:59:48 -05:00
Roger Dingledine
e569e6b201
Merge branch 'maint-0.2.2'
2011-03-08 18:16:27 -05:00
Roger Dingledine
6426cd14f3
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-03-08 18:16:06 -05:00
Roger Dingledine
d080fe8db1
move to march 2011 geoip file
2011-03-08 18:15:17 -05:00
Nick Mathewson
63651b9191
Merge remote branch 'origin/maint-0.2.2'
...
Trivial conflicts fixed in or.h
Conflicts:
src/or/or.h
2011-03-08 16:20:53 -05:00
Roger Dingledine
cb3c3c63cb
Merge branch 'maint-0.2.2'
2011-03-08 16:14:53 -05:00
Nick Mathewson
00446973f2
Merge remote branch 'sebastian/bug2250' into maint-0.2.2
2011-03-08 16:13:28 -05:00
Nick Mathewson
f9bb3ced51
Merge remote branch 'origin/maint-0.2.2'
...
Resolved trivial one-line conflicts.
Conflicts:
src/or/dirserv.c
src/or/rephist.c
2011-03-08 16:10:40 -05:00
Roger Dingledine
dbd4a01756
steps roger takes when making a new release
2011-03-08 16:06:32 -05:00
Nick Mathewson
0d78a16c36
Merge remote branch 'sebastian/bug1035' into maint-0.2.2
2011-03-08 15:52:43 -05:00
Roger Dingledine
9c72324ae8
update spec locations
2011-03-08 15:31:04 -05:00
Nick Mathewson
d5907e7d9d
Merge remote branch 'origin/maint-0.2.2'
2011-03-08 15:23:30 -05:00
Nick Mathewson
9ad083d573
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-03-08 15:20:48 -05:00
Nick Mathewson
9a6df21539
Avoid crash in any_pending_bridge_descriptor_fetches
...
This is based on shitlei's fix for bug2629, with extra parens removed.
Fixes bug 2629, bugfix on 0.2.1.2-alpha.
2011-03-08 15:17:41 -05:00
Roger Dingledine
95edd51116
make nickm's proposed convention from 2003 be gospel
2011-03-08 14:59:30 -05:00
Nick Mathewson
26009a3ed0
Merge remote branch 'origin/maint-0.2.2'
2011-03-07 17:12:08 -05:00
Nick Mathewson
3bd83b8fb6
Merge remote branch 'sebastian/bug2660' into maint-0.2.2
2011-03-07 17:09:23 -05:00
Sebastian Hahn
2f8e96b553
Fix log message when we have too few dirauths
...
The calculation of when to send the logmessage was correct, but we
didn't give the correct number of relays required: We want more than
half of all authorities we know about. Fixes bug 2663.
2011-03-07 00:06:36 +01:00
Nick Mathewson
176e8a0a2a
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/routerparse.c
2011-03-06 13:46:11 -05:00
Nick Mathewson
35fcec3880
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-03-06 13:42:28 -05:00
Nick Mathewson
4fa70e11ed
Merge branch 'real_ipv6_fix' into maint-0.2.1
2011-03-06 13:42:05 -05:00
Nick Mathewson
2ce132e335
Oops, here's the *REAL* fix for the ipv6 issue
...
We need to _REJECT_ descriptors with accept6/reject6 lines. If we
let them onto the network , other un-upgraded tors will crash.
2011-03-06 13:41:55 -05:00
Nick Mathewson
0f637492e3
Merge branch 'careful_with_all_descs' into maint-0.2.1
2011-03-06 13:35:42 -05:00
Nick Mathewson
b231026c42
changes file for careful_with_all_descs
2011-03-06 13:35:24 -05:00
Nick Mathewson
3da0837b0b
Revert "Disallow reject6 and accept6 lines in descriptors"
...
This reverts commit b3918b3bbb
2011-03-06 13:26:38 -05:00
Nick Mathewson
07b8b439c4
Merge remote branch 'origin/maint-0.2.2'
2011-03-06 13:23:02 -05:00
Nick Mathewson
ed14888e7e
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
Conflicts:
src/or/policies.c
2011-03-06 13:20:21 -05:00
Nick Mathewson
8b01fd7bad
exit_policy_is_general_exit is IPv4 only; it should admit it.
2011-03-06 13:16:53 -05:00
Nick Mathewson
fb421c0005
Changes file for ipv6 parsing issue
2011-03-06 13:15:32 -05:00
Sebastian Hahn
9f614507b6
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-03-06 18:25:44 +01:00
Sebastian Hahn
b3918b3bbb
Disallow reject6 and accept6 lines in descriptors
...
This fixes a remotely triggerable assert on directory authorities, who
don't handle descriptors with ipv6 contents well yet. We will want to
revert this once we're ready to handle ipv6.
Issue raised by lorth on #tor, who wasn't able to use Tor anymore.
Analyzed with help from Christian Fromme. Fix suggested by arma. Bugfix
on 0.2.1.3-alpha.
2011-03-06 18:20:28 +01:00
Sebastian Hahn
f83debb51d
Fix setting target port in get_interface_address6
...
We want to use the discard port correctly, so a htons() was missing.
Also we need to set it correctly depending on address family.
Review provided by danieldg
2011-03-05 16:58:20 +01:00
Sebastian Hahn
865ea5d263
Fix connect() failures in get_interface_address6()
...
The third argument for connect should be dependent on the address
family. Issue spotted by piebeer who also wrote the patch.
2011-03-05 16:57:05 +01:00
Nick Mathewson
c6d8e75dc3
Merge remote branch 'origin/maint-0.2.2'
2011-03-04 00:25:14 -05:00
Nick Mathewson
bcbc8c51cb
Do not serve encrypt-only descriptors with the "all" request. Reported by piebeer
2011-03-04 00:04:25 -05:00
Nick Mathewson
f608872b0c
C style fix: a no-args function is void fn(void), not void fn().
2011-03-03 23:42:14 -05:00
Nick Mathewson
8ae179deec
Add a magic field to tor_tls_t to catch exdata corruption bugs, if any appear.
2011-03-03 23:41:34 -05:00
Robert Ransom
4d21fe2870
Emend changes/tls-hash
2011-03-03 17:54:53 -08:00
Robert Ransom
74fc993b98
Check the result of SSL_set_ex_data
...
Reported by piebeer.
2011-03-03 16:17:39 -08:00
Robert Ransom
fe1137be6f
Use SSL_*_ex_data instead of SSL_*_app_data
...
SSL_*_app_data uses ex_data index 0, which will be the first one allocated
by SSL_get_ex_new_index. Thus, if we ever started using the ex_data feature
for some other purpose, or a library linked to Tor ever started using
OpenSSL's ex_data feature, Tor would break in spectacular and mysterious
ways. Using the SSL_*_ex_data functions directly now may save us from
that particular form of breakage in the future.
But I would not be surprised if using OpenSSL's ex_data functions at all
(directly or not) comes back to bite us on our backends quite hard. The
specified behaviour of dup_func in the man page is stupid, and
crypto/ex_data.c is a horrific mess.
2011-03-03 15:34:53 -08:00
Robert Ransom
13ee803469
Remove now-unused helper functions
...
These functions were needed only by code removed in the preceding commit.
Reported by mobmix.
2011-03-03 14:59:21 -08:00
Nick Mathewson
1d6af67ab8
Merge remote branch 'rransom/typo-fix-2011-03-03-01' into maint-0.2.2
2011-03-03 13:50:17 -05:00
Robert Ransom
88e0de9ebb
Fix typo in man page
2011-03-03 10:41:39 -08:00
Gladys Shufflebottom
49de5431d5
remove tls related hash table code
2011-03-01 18:11:25 -05:00
Nick Mathewson
d60a7c2f8d
Merge remote branch 'origin/maint-0.2.2'
2011-03-01 17:15:37 -05:00
Nick Mathewson
6b7408178b
Avoid spurious bwhist parsing failures
...
This should fix a bug that special ran into, where if your state file
didn't record period maxima, it would never decide that it had
successfully parsed itself unless you got lucky with your
uninitialized-variable values.
This patch also tries to improve error messags in the case where a
maximum value legitimately doesn't parse.
2011-03-01 17:08:02 -05:00
Sebastian Hahn
5c7c5e593f
Tweak the bug2250 fix slightly
...
Rename the _UsingTestingTorNetwork hidden option to
_UsingTestNetworkDefaults (thanks Nick for the suggestion) and added a
changes file.
2011-03-01 10:05:18 +01:00
Nick Mathewson
42c1a47123
Revert bug1074_launch_authconn* branch: needs more design, less crashing
2011-02-28 12:58:29 -05:00
Sebastian Hahn
5a4f7fa1e4
clarify an assert
...
also log about running changes, even on a bridge authority.
2011-02-26 09:42:44 +01:00
