Nick Mathewson
ca282e5326
Merge branch 'bug4424' into maint-0.2.2
2011-11-07 11:47:28 -05:00
Nick Mathewson
02d89c5c66
Remove an extraneous "if" in the 4424 fix
2011-11-07 11:46:51 -05:00
Nick Mathewson
21dd6eae9e
Merge remote-tracking branch 'asn-mytor/bug4012_clienttransportplugin'
2011-11-07 11:37:29 -05:00
Robert Ransom
65a0d7e7ef
Don't leak an extend_info_t in rend_client_any_intro_points_usable
2011-11-07 08:35:51 -08:00
Nick Mathewson
51f53b590e
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-07 10:44:02 -05:00
Nick Mathewson
4d8306e0e9
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-11-07 10:42:34 -05:00
Karsten Loesing
6d45c6d548
Update to the November 2011 GeoIP database.
2011-11-07 14:23:48 +01:00
Sebastian Hahn
be6928d6e7
Add a changes file for 4410
2011-11-06 18:00:10 +01:00
Dan Rosenberg
d5161ab895
Fix remotely triggerable assert during ip decryption
...
Fixes bug 4410.
2011-11-06 17:23:14 +01:00
George Kadianakis
1c532594e7
Added man entry for ClientTransportPlugin.
2011-11-06 00:50:22 +01:00
Roger Dingledine
350fe95259
fix grammar in man page entries from proposal 171
2011-11-03 19:08:25 -04:00
George Kadianakis
e097bffaed
Fix issues pointed out by nickm.
...
- Rename tor_tls_got_server_hello() to tor_tls_got_client_hello().
- Replaced some aggressive asserts with LD_BUG logging.
They were the innocent "I believe I understand how these callbacks
work, and this assert proves it" type of callbacks, and not the "If
this statement is not true, computer is exploding." type of
callbacks.
- Added a changes file.
2011-11-03 22:33:50 +01:00
Nick Mathewson
c1005dd6d3
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-03 13:24:46 -04:00
Nick Mathewson
972564630e
Merge branch 'bug4383_nm' into maint-0.2.2
2011-11-03 13:23:59 -04:00
George Kadianakis
3ae96845d3
Fix a memleak when fetching descriptors for bridges in ExcludeNodes.
2011-11-03 13:23:50 -04:00
Nick Mathewson
325a659cb1
Even when we can't answer an AUTH_CHALLENGE, send NETINFO.
...
Fixes bug 4368; fix on 0.2.3.6-alpha; bug found by "frosty".
2011-11-03 12:40:02 -04:00
Nick Mathewson
88c4b425bd
Fix bug 4367: correctly detect auth_challenge cells we can't use
...
Found by frosty_un, bugfix on 0.2.3.6-alpha, fix suggested by arma.
2011-11-03 11:52:35 -04:00
Nick Mathewson
d029c3223a
changes file for bug4366
2011-11-03 10:24:31 -04:00
Andrea Gelmini
72d4d762c1
Remove some duplicate includes
2011-11-03 10:23:33 -04:00
Nick Mathewson
5613b9b9f2
Fix a proposal number in the changelog.
2011-11-03 09:37:12 -04:00
Sebastian Hahn
eb30999972
Fix a check-spaces complaint
2011-11-02 20:57:58 +01:00
Sebastian Hahn
c98faa1a23
Resolve a crash when running as dirauth
...
When we're asked for our own descriptor, don't crash.
2011-11-02 20:57:23 +01:00
George Kadianakis
d4ba301f29
Tell the bridge operator on what ports his transports spawned.
...
- Add a LOG_WARN message when registering the transports of a server
managed proxy, so that the bridge operator can see in what ports the
transports spawned and notify his/her clients.
2011-11-02 14:23:41 +01:00
Robert Ransom
60ed98e184
Reduce lifetime of DH public key replay-detection cache elements
2011-10-31 05:05:45 -07:00
Robert Ransom
272dd90b5c
Ignore timestamps of INTRODUCE2 cells
2011-10-31 05:05:45 -07:00
Roger Dingledine
be1f3a5eb5
normalize the name of the CERTS cell
2011-10-31 04:33:38 -04:00
Nick Mathewson
c58f4a8652
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-10-30 21:28:36 -04:00
Nick Mathewson
16dbcafb06
Merge remote-tracking branch 'erinn/win-bundle-fix' into maint-0.2.2
2011-10-30 21:28:19 -04:00
Erinn Clark
a6ea34977b
remove absolute path from contrib/package_nsis-mingw.sh in order to make it easier to automatically build tor expert bundle
2011-10-31 00:52:52 +00:00
Roger Dingledine
c2d03beb65
blurb and version bump for 0.2.3.7-alpha
2011-10-30 18:39:49 -04:00
Robert Ransom
1a52a947c5
Move the real INTRODUCE2 replay-detection cache into rend_intro_point_t
2011-10-30 04:46:58 -07:00
Robert Ransom
1eba4f0cc3
Make introduction points expire
2011-10-30 02:17:59 -07:00
Robert Ransom
00885652db
Allow intro points to expire somewhat gracefully
...
The Right Way to expire an intro point is to establish a new one to
replace it, publish a new descriptor that doesn't list any expiring intro
points, and *then*, once our upload attempts for the new descriptor have
ended (whether in success or failure), close the expiring intro points.
Unfortunately, we can't find out when the new descriptor has actually been
uploaded, so we'll have to settle for a five-minute timer.
There should be no significant behaviour changes due to this commit (only
a log-message change or two), despite the rather massive overhaul, so this
commit doesn't include a changes/ file. (The commit that teaches
intro_point_should_expire_now to return non-zero gets a changes/ file,
though.)
2011-10-30 02:17:10 -07:00
Robert Ransom
ae9a831294
Use SMARTLIST_FOREACH_BEGIN and _END, not a for loop
2011-10-30 02:17:07 -07:00
Robert Ransom
e46d56a9b4
Correct bogus comments
...
The behaviour of rend_services_introduce here is likely as bogus as the
comments were.
2011-10-30 02:17:06 -07:00
Robert Ransom
290b4dc3d6
Use a more meaningful variable name
2011-10-30 02:17:06 -07:00
Robert Ransom
68331cbd81
Determine whether an intro point was in the last HS desc in a sane way
2011-10-30 02:17:05 -07:00
Robert Ransom
3f6a2d3e2a
Record which intro points were listed in the last HS desc
2011-10-30 02:17:05 -07:00
Robert Ransom
6f035cb2b4
Record the number of INTRODUCE2 cells each intro point has received
2011-10-30 02:17:04 -07:00
Robert Ransom
6b26999146
Correct a log message
2011-10-30 02:17:01 -07:00
Robert Ransom
c60148c7f5
Record the time at which each intro point was first published
2011-10-30 02:17:00 -07:00
Robert Ransom
6f220de7b9
Improve a comment
2011-10-30 02:17:00 -07:00
Robert Ransom
190aac0eab
Allow different HSes to maintain different numbers of intro points
2011-10-30 02:16:59 -07:00
Roger Dingledine
46296b3fa4
there will be a new alpha release today (oct 30)
2011-10-30 01:58:05 -04:00
Roger Dingledine
eeb6588389
bridges send netinfo cells like clients on outgoing conns
...
fixes bug 4348
2011-10-29 21:43:23 -04:00
Roger Dingledine
c03b4fa826
amend the changelog entry for 4299
...
it doesn't have to do with small cells. rather, it has to do with
using cells to decide whether to mark the connection for close.
2011-10-29 16:24:59 -04:00
Roger Dingledine
cbdefc70fc
fold in changes entries
2011-10-29 15:10:37 -04:00
Nick Mathewson
6be596e2dc
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/config.c
2011-10-29 09:22:58 -04:00
Sebastian Hahn
c5c5f859d3
Add a changes file for the 4340 fix
2011-10-29 11:21:37 +02:00
Sebastian Hahn
dfdb4fde1a
Disable stats requiring geoip info if we have none
...
In other parts of the code we will otherwise attempt to collect these
statistics, and that will lead to crashes.
2011-10-29 11:20:02 +02:00