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
0d78a16c36
Merge remote branch 'sebastian/bug1035' into maint-0.2.2
2011-03-08 15:52:43 -05:00
d5907e7d9d
Merge remote branch 'origin/maint-0.2.2'
2011-03-08 15:23:30 -05:00
9ad083d573
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-03-08 15:20:48 -05:00
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
26009a3ed0
Merge remote branch 'origin/maint-0.2.2'
2011-03-07 17:12:08 -05:00
3bd83b8fb6
Merge remote branch 'sebastian/bug2660' into maint-0.2.2
2011-03-07 17:09:23 -05:00
176e8a0a2a
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/routerparse.c
2011-03-06 13:46:11 -05:00
35fcec3880
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-03-06 13:42:28 -05:00
4fa70e11ed
Merge branch 'real_ipv6_fix' into maint-0.2.1
2011-03-06 13:42:05 -05:00
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
0f637492e3
Merge branch 'careful_with_all_descs' into maint-0.2.1
2011-03-06 13:35:42 -05:00
b231026c42
changes file for careful_with_all_descs
2011-03-06 13:35:24 -05:00
07b8b439c4
Merge remote branch 'origin/maint-0.2.2'
2011-03-06 13:23:02 -05:00
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
fb421c0005
Changes file for ipv6 parsing issue
2011-03-06 13:15:32 -05:00
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
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
4d21fe2870
Emend changes/tls-hash
2011-03-03 17:54:53 -08:00
49de5431d5
remove tls related hash table code
2011-03-01 18:11:25 -05:00
42c1a47123
Revert bug1074_launch_authconn* branch: needs more design, less crashing
2011-02-28 12:58:29 -05:00
a47fdaf9a0
Merge branch 'bug1074_launch_conn_on_skew'
...
Fixed conflict on rename of router_get_by_digest->router_get_by_id_digest
Conflicts:
src/or/command.c
2011-02-25 12:12:44 -05:00
22810d740c
Changes file for altf4's bug1074 stuff
2011-02-25 12:12:02 -05:00
a2a8adeee5
Merge remote branch 'origin/maint-0.2.2'
2011-02-25 11:24:35 -05:00
aa178aae03
Merge branch 'bug1863_bwhist' into maint-0.2.2
2011-02-25 11:22:12 -05:00
9265164180
Merge remote branch 'origin/maint-0.2.2'
...
There was a conflict from the node_t transition, but it was an easy fix.
Conflicts:
src/or/circuitbuild.c
2011-02-22 18:41:06 -05:00
16b8b9b00f
Merge remote branch 'arma/bug2403' into maint-0.2.2
2011-02-22 18:38:03 -05:00
a2727f6249
prevent same entry and exit for insane edge case
2011-02-22 17:54:25 -05:00
491abbc65e
Merge remote branch 'public/bug1859_021' into maint-0.2.1
2011-02-22 17:19:41 -05:00
3d4c2ffa30
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 15:58:50 -05:00
e606f19fa3
changes file for removing torspec from the tarball
2011-02-22 15:58:19 -05:00
7605985b3f
Merge remote branch 'public/bug2402_nothing' into maint-0.2.1
2011-02-22 15:54:13 -05:00
372773d681
changes file for removing torspec from the tarball
2011-02-22 14:50:00 -05:00
b7f201f746
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/policies.c
src/or/policies.h
2011-02-22 14:10:42 -05:00
cdc59c198a
Don't let bad DNS make exit policy and declared exit policy get out of sync
...
Patch from "postman" on trac. Fixes bg 2366. Bug on 0.1.2.5-alpha.
2011-02-22 14:06:28 -05:00
46b07462ae
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 13:02:42 -05:00
9d5873cdae
Merge branch 'log_domains' into maint-0.2.2
2011-02-22 13:01:02 -05:00
933ffd536d
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 12:47:47 -05:00
613073e449
Merge remote branch 'sebastian/bug2504' into maint-0.2.2
2011-02-22 12:47:21 -05:00
ce4f879101
Add a changes file for the heartbeat code
2011-02-22 12:41:22 -05:00
0ba69714b4
Merge remote branch 'sebastian/bug2444'
2011-02-22 11:10:57 -05:00
d120ee1c63
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 01:03:06 -05:00
e9fb50c797
Remove changes files that predate current origin/release-0.2.2
2011-02-21 14:22:12 -05:00
444a955e4a
Don't crash a bridge authority on SIGHUP if it's not in the consensus
...
Fixes bug 2572.
2011-02-16 04:12:37 -08:00
5dbaf9dbd5
Windows has EACCES, not EACCESS
...
Once again spotted by mobmix
Also add a changes file for the fix
2011-02-11 17:02:26 +01:00
1c5b19a31a
Merge branch 'maint-0.2.2'
2011-02-11 01:21:04 -05:00
9b745cdbf9
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-02-11 01:20:47 -05:00
28de4d83fd
fix the other half of bug 1074
2011-02-10 17:11:06 -05:00
50c259d763
Make the DH parameter we use for TLS match the one from Apache's mod_ssl
...
Our regular DH parameters that we use for circuit and rendezvous
crypto are unchanged. This is yet another small step on the path of
protocol fingerprinting resistance.
(Backport from 0.2.2's 5ed73e3807
2011-02-10 15:55:06 -05:00
f1a004797e
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
doc/tor.1.txt
2011-02-10 15:52:04 -05:00
Nick Mathewson
Sebastian Hahn
Robert Ransom
Gladys Shufflebottom
Roger Dingledine