ceebc8283f
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-07 11:48:02 -05:00
ca282e5326
Merge branch 'bug4424' into maint-0.2.2
2011-11-07 11:47:28 -05:00
02d89c5c66
Remove an extraneous "if" in the 4424 fix
2011-11-07 11:46:51 -05:00
21dd6eae9e
Merge remote-tracking branch 'asn-mytor/bug4012_clienttransportplugin'
2011-11-07 11:37:29 -05:00
65a0d7e7ef
Don't leak an extend_info_t in rend_client_any_intro_points_usable
2011-11-07 08:35:51 -08:00
51f53b590e
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-07 10:44:02 -05:00
4d8306e0e9
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-11-07 10:42:34 -05:00
be6928d6e7
Add a changes file for 4410
2011-11-06 18:00:10 +01:00
d5161ab895
Fix remotely triggerable assert during ip decryption
...
Fixes bug 4410.
2011-11-06 17:23:14 +01:00
1c532594e7
Added man entry for ClientTransportPlugin.
2011-11-06 00:50:22 +01:00
350fe95259
fix grammar in man page entries from proposal 171
2011-11-03 19:08:25 -04:00
c1005dd6d3
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-03 13:24:46 -04:00
972564630e
Merge branch 'bug4383_nm' into maint-0.2.2
2011-11-03 13:23:59 -04:00
3ae96845d3
Fix a memleak when fetching descriptors for bridges in ExcludeNodes.
2011-11-03 13:23:50 -04:00
d029c3223a
changes file for bug4366
2011-11-03 10:24:31 -04:00
72d4d762c1
Remove some duplicate includes
2011-11-03 10:23:33 -04:00
5613b9b9f2
Fix a proposal number in the changelog.
2011-11-03 09:37:12 -04:00
eb30999972
Fix a check-spaces complaint
2011-11-02 20:57:58 +01:00
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
c58f4a8652
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-10-30 21:28:36 -04:00
16dbcafb06
Merge remote-tracking branch 'erinn/win-bundle-fix' into maint-0.2.2
2011-10-30 21:28:19 -04:00
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
c2d03beb65
blurb and version bump for 0.2.3.7-alpha
2011-10-30 18:39:49 -04:00
46296b3fa4
there will be a new alpha release today (oct 30)
2011-10-30 01:58:05 -04:00
eeb6588389
bridges send netinfo cells like clients on outgoing conns
...
fixes bug 4348
2011-10-29 21:43:23 -04:00
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
cbdefc70fc
fold in changes entries
2011-10-29 15:10:37 -04:00
6be596e2dc
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/config.c
2011-10-29 09:22:58 -04:00
c5c5f859d3
Add a changes file for the 4340 fix
2011-10-29 11:21:37 +02:00
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
4dd8d811d6
Merge branch 'bug4343'
2011-10-28 18:05:25 -04:00
00a0de8508
Bump version to 0.2.3.6-alpha-dev
2011-10-28 18:05:17 -04:00
212c3acd42
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/command.c
2011-10-28 18:02:57 -04:00
cf8bffa359
Discard all cells on a marked connection
...
Fix for bug 4299
2011-10-28 17:04:15 -04:00
2018f86e0c
"Authetnicate" is not the usual spelling
2011-10-28 16:41:04 -04:00
c2a098e980
Fix a double-free that would occur on an invalid cert in a CERTS cell
...
We would stash the certs in the handshake state before checking them
for validity... and then if they turned out to be invalid, we'd give
an error and free them. Then, later, we'd free them again when we
tore down the connection.
Fixes bug 4343; fix on 0.2.3.6-alpha.
2011-10-28 16:38:56 -04:00
7a8960cf1b
Fix a memory-poisoning memset in tortls.c
2011-10-28 16:37:42 -04:00
a2517fa77c
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-10-28 09:53:23 -04:00
f6b1dc2805
Fix typo, spotted by tmpname0901. Thanks!
2011-10-28 09:52:24 -04:00
ba91272ded
Merge branch 'maint-0.2.2'
2011-10-27 20:53:17 -04:00
48bafb47ac
bump maint-0.2.2 to 0.2.2.34-dev
2011-10-27 20:50:48 -04:00
6258013e41
find all those stanzas in master too
2011-10-27 20:15:50 -04:00
425e4236c6
Merge branch 'maint-0.2.2'
2011-10-27 20:04:51 -04:00
9c2ca5b52f
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-10-27 20:03:21 -04:00
5d3095152e
bump maint to 0.2.1.31
2011-10-27 20:01:58 -04:00
47dff61061
a little blurb for 0.2.3.6-alpha
2011-10-26 20:54:15 -04:00
821f59b4df
forward-port the stable releases notes
2011-10-26 20:41:51 -04:00
1a160ae523
bump to 0.2.3.6-alpha
2011-10-26 20:33:23 -04:00
0eaebebffa
fold in changes entries
2011-10-26 20:31:49 -04:00
2dec6597af
Merge branch 'maint-0.2.2_secfix' into master_secfix
...
Conflicts:
src/common/tortls.c
src/or/connection_or.c
src/or/dirserv.c
src/or/or.h
2011-10-27 00:38:45 +02:00
Nick Mathewson
Robert Ransom
Sebastian Hahn
Dan Rosenberg
George Kadianakis
Roger Dingledine
Andrea Gelmini
Erinn Clark