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
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
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
449d895f06
Merge branch 'bug2408-v2-021-common' into bug2408-v2-022
2011-02-09 03:05:21 -08:00
7bf06d4a4f
Ignore and warn about "PublishServerDescriptor hidserv"
...
Fixes #2408 .
2011-02-09 02:33:24 -08:00
cc9809c1f7
Merge remote branch 'origin/maint-0.2.2'
2011-02-08 14:37:31 -05:00
d43470ad8a
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-02-08 14:37:02 -05:00
20b75989ac
dtrt when only relaybandwidthburst is set
...
fixes bug 2470
2011-02-07 23:21:33 -05:00
4b6b398cff
Merge branch 'maint-0.2.2'
2011-02-07 22:21:01 -05:00
54ccc80a4a
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-02-07 22:20:35 -05:00
9c2cb6fc89
Update to the February 1 2011 Maxmind GeoLite Country database.
2011-02-07 22:19:37 -05:00
ff5810aea9
Merge remote branch 'origin/maint-0.2.2'
2011-02-07 12:47:04 -05:00
98cef0ac1e
Merge branch 'bug2279' into maint-0.2.2
2011-02-07 12:43:54 -05:00
69f7c0385b
Merge remote branch 'origin/maint-0.2.2' for bug2203_rebased
...
There was a merge conflict in routerlist.c due to the new node_t logic.
Conflicts:
src/or/routerlist.c
2011-02-04 12:26:59 -05:00
e9803aa710
Merge branch 'bug2203_rebased' into maint-0.2.2
2011-02-04 12:22:18 -05:00
a6c811313a
Merge remote branch 'origin/maint-0.2.2'
2011-02-03 14:21:14 -05:00
f9e251ccf8
changes file for ASLR/DEP build on windows
2011-02-03 14:20:08 -05:00
e94ee583d6
Merge remote branch 'sebastian/bug2450' into maint-0.2.2
2011-02-03 13:59:58 -05:00
912b76a1bf
Merge remote branch 'origin/maint-0.2.2'
2011-02-03 13:56:37 -05:00
2fa9ddb958
Merge remote branch 'public/bug2378' into maint-0.2.2
2011-02-03 13:54:28 -05:00
f2bb7b17d7
Remove country codes from EntryNodes manpage entry
2011-01-28 14:19:28 +01:00
490d397dbf
Log which config file we read
...
It is often not entirely clear what options Tor was built with, so it
might not be immediately obvious which config file Tor is using when it
found one. Log the config file at startup.
2011-01-27 15:31:34 +01:00
0337fc7b06
Merge remote branch 'origin/maint-0.2.2'
2011-01-26 11:49:41 -05:00
e6da9a98e9
Merge branch 'bug2181' into maint-0.2.2
2011-01-26 11:46:13 -05:00
Robert Ransom
Gladys Shufflebottom
Nick Mathewson
Roger Dingledine
Sebastian Hahn
Karsten Loesing