Nick Mathewson
bc2d9357f5
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-10-10 22:50:52 -04:00
Robert Ransom
274b25de12
Don't launch a useless circuit in rend_client_reextend_intro_circuit
...
Fixes bug 4212. Bug reported by katmagic and found by Sebastian.
2011-10-10 03:05:19 -07:00
Nick Mathewson
f37d24c550
Note ticket and source version for feature3951 in changes file
2011-10-07 16:47:43 -04:00
Nick Mathewson
ca597efb22
Merge remote-tracking branch 'karsten/feature3951' into maint-0.2.2
2011-10-07 16:46:50 -04:00
Nick Mathewson
1ec22eac4b
Merge remote-tracking branch 'public/bug2003_nm'
2011-10-07 16:43:45 -04:00
Nick Mathewson
b49fcc6cf2
Merge remote-tracking branch 'rransom-tor/bug4018'
2011-10-07 16:32:04 -04:00
Nick Mathewson
e8ed465776
Merge remote-tracking branch 'public/bug2430'
2011-10-07 16:28:32 -04:00
Nick Mathewson
98e5c63eb2
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-10-07 12:20:08 -04:00
warms0x
6d027a3823
Avoid running DNS self-tests if we're operating as a bridge
2011-10-07 12:18:26 -04:00
Karsten Loesing
9dfb884522
Turn on directory request statistics by default.
...
Change the default values for collecting directory request statistics and
inlcuding them in extra-info descriptors to 1.
Don't break if we are configured to collect directory request or entry
statistics and don't have a GeoIP database. Instead, print out a notice
and skip initializing the affected statistics code.
This is the cherry-picked 499661524b
.
2011-10-05 08:03:31 +02:00
Nick Mathewson
2725a88d5e
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-10-03 15:19:00 -04:00
Nick Mathewson
4aa4bce474
Merge remote-tracking branch 'rransom-tor/bug3335-v2'
...
Conflicts:
src/or/connection_edge.c
src/or/rendclient.c
2011-10-03 15:06:07 -04:00
Nick Mathewson
a7f93b509c
Add changes file for bug 4094
2011-10-03 12:58:07 -04:00
Robert Ransom
c5226bfe1c
Remove an HS's last_hid_serv_requests entries when a conn. attempt ends
2011-10-02 16:19:36 -07:00
Robert Ransom
fbea8c8ef1
Detect and remove unreachable intro points
2011-10-02 12:49:35 -07:00
Robert Ransom
34a6b8b7e5
Clear the timed_out flag when an HS connection attempt ends
2011-10-02 12:49:35 -07:00
Sebastian Hahn
103c861dfe
Looks like Windows version 6.2 will be Windows 8
...
Thanks to funkstar for the report
2011-10-01 14:50:44 +02:00
Roger Dingledine
25f786f7ec
fold in recent changes entries
2011-09-28 15:41:29 -04:00
Roger Dingledine
36829539d6
Merge branch 'maint-0.2.2'
2011-09-28 15:38:02 -04:00
Roger Dingledine
ff8aba7053
bridges should use create_fast cells for their own circuits
...
fixes bug 4124, as noticed in bug 4115
2011-09-28 15:35:27 -04:00
Roger Dingledine
4e88a3bc3e
Merge branch 'maint-0.2.2'
2011-09-28 15:13:05 -04:00
Roger Dingledine
458cc9d351
start preparing the 0.2.3.5-alpha changelog
2011-09-28 15:12:16 -04:00
Roger Dingledine
0b5d2646d5
bug 4115: make bridges use begindir for their dir fetches
...
removes another avenue for enumerating bridges.
2011-09-28 14:50:43 -04:00
Nick Mathewson
a4b7525c3c
Fix a crash bug in tor_assert(md->held_by_node)
...
The fix is to turn held_by_node into a reference count.
Fixes bug 4118; bugfix on 0.2.3.1-alpha.
2011-09-28 13:40:21 -04:00
Roger Dingledine
88516f65c9
Merge branch 'maint-0.2.2'
2011-09-24 22:47:53 -04:00
Nick Mathewson
ccceefe136
Add a changes file for Tom Lowenthal's patch for #4063
2011-09-24 22:15:13 -04:00
Nick Mathewson
a8297a301e
Changes file for feature3630
2011-09-22 15:07:35 -04:00
Nick Mathewson
40288e1e66
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-09-20 10:25:56 -04:00
Nick Mathewson
bfa75f70bb
changes file for bug 4059
2011-09-20 09:56:26 -04:00
Nick Mathewson
2394c74017
Log errno on listener socket creation failure.
...
This may help diagnose bug 4027.
2011-09-15 09:51:48 -04:00
Robert Ransom
c1ac0695d5
Fix a bogus warning
2011-09-14 00:05:03 -07:00
Roger Dingledine
c133d71bdd
a blurb for 0.2.3.4-alpha
2011-09-13 19:56:59 -04:00
Nick Mathewson
296649fd2b
Provide missing description for our FLEXIBLE_ARRAY_MEMBER defines
...
Apparently autoheader throws a tantrum if you say 'AC_DEFINE([a],
[b])'. Instead you must say 'AC_DEFINE([a], [b], [description of
a])'. We were running into this in our replacement definitions for
FLEXIBLE_ARRAY_MEMBER, which were only getting built on autoconf
versions before 2.61 -- and this made us stop working with those
autoconf versinos.
Fixes bug 2430; bugfix on 0.2.3.1-alpha.
2011-09-13 19:51:37 -04:00
Roger Dingledine
1fcaeb6092
Merge branch 'maint-0.2.2'
2011-09-13 18:32:00 -04:00
Roger Dingledine
4a351b4b9e
Merge branch 'maint-0.2.1' into maint-0.2.2
...
Conflicts:
src/or/main.c
src/or/router.c
2011-09-13 18:27:13 -04:00
Roger Dingledine
62ec584a30
Generate our ssl session certs with a plausible lifetime
...
Nobody but Tor uses certs on the wire with 2 hour lifetimes,
and it makes us stand out. Resolves ticket 4014.
2011-09-13 18:24:45 -04:00
Roger Dingledine
1e1cc43b57
Merge branch 'maint-0.2.2'
2011-09-12 05:54:55 -04:00
Karsten Loesing
d679ef623f
Update to the September 2011 GeoIP database.
2011-09-12 11:43:51 +02:00
Nick Mathewson
386966142e
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-09-11 16:25:14 -04:00
Robert Ransom
8ea6d29fe4
Demote 'INTRODUCE2 cell is too {old,new}' message to info level
2011-09-10 21:56:05 -04:00
Robert Ransom
b10735903b
Demote HS 'replay detected' log message for DH public keys to info level
2011-09-10 21:56:05 -04:00
Nick Mathewson
a8838a86fe
Changes file for bug3936 changes
2011-09-10 17:51:38 -04:00
Nick Mathewson
35f9be7d04
Merge remote-tracking branch 'rransom-tor/typo-fix-ohkah8Ah'
2011-09-10 17:45:27 -04:00
Robert Ransom
c621e52883
Fix log message typo.
2011-09-10 16:15:52 -04:00
Roger Dingledine
ae2856b6f6
start an 0.2.3.4-alpha changelog
2011-09-09 13:51:15 -04:00
Nick Mathewson
a41f1fc612
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
configure.in
src/or/circuitbuild.c
2011-09-09 12:58:12 -04:00
Nick Mathewson
b0695c11eb
Merge remote-tracking branch 'public/gcc-295-fix' into maint-0.2.2
2011-09-09 12:54:27 -04:00
Nick Mathewson
4467799f45
Merge remote-tracking branch 'public/enhance_replay_detection' into maint-0.2.2
2011-09-09 12:53:45 -04:00
Nick Mathewson
cb9226bcdb
Check for replays in PK-encrypted part of intro cell, not just in the g^x value
2011-09-09 12:49:47 -04:00
Nick Mathewson
45ca0d2bfa
Add changes file for bsd4 fixes
2011-09-09 10:41:06 -04:00