 Nick Mathewson
|
1af67d7f72
|
Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6
|
2015-03-09 19:47:12 -04:00 |
|
|
Nick Mathewson
|
7c9be64e1a
|
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
|
2015-03-09 16:25:11 -04:00 |
|
|
Nick Mathewson
|
306f2f0eff
|
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
|
2015-03-09 16:24:44 -04:00 |
|
|
Nick Mathewson
|
220e9be095
|
Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4
|
2015-03-09 16:24:07 -04:00 |
|
|
Nick Mathewson
|
5588e677bd
|
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
|
2015-03-09 16:23:55 -04:00 |
|
 Karsten Loesing
|
62714068d9
|
Update geoip6 to the March 3 2015 database.
|
2015-03-09 21:11:52 +01:00 |
|
|
Karsten Loesing
|
beda8d2934
|
Update geoip to the March 3 2015 database.
|
2015-03-09 21:09:44 +01:00 |
|
|
Nick Mathewson
|
24c031b1a2
|
Don't use checked strl{cat,cpy} on OSX.
There is a bug in the overlap-checking in strlcat that can crash Tor
servers. Fixes bug 15205; this is an OSX bug, not a Tor bug.
|
2015-03-09 15:09:49 -04:00 |
|
|
Nick Mathewson
|
c066f2d30b
|
We actually merged this one a while ago.
|
2015-03-09 13:49:55 -04:00 |
|
|
Nick Mathewson
|
8450f6e9a0
|
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
|
2015-03-09 13:21:20 -04:00 |
|
|
Nick Mathewson
|
448bd22092
|
Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5
|
2015-03-09 13:17:20 -04:00 |
|
|
Nick Mathewson
|
62631904cb
|
GETINFO bw-event-cache to get information on recent BW events
Closes 14128; useful to regain functionality lost because of 13988.
|
2015-03-09 13:13:56 -04:00 |
|
|
Nick Mathewson
|
e3408248b9
|
Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5
|
2015-03-09 13:12:54 -04:00 |
|
|
Nick Mathewson
|
410ce4cb49
|
Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5
|
2015-03-09 13:09:50 -04:00 |
|
|
Nick Mathewson
|
fb0de57ba2
|
Merge remote-tracking branch 'public/feature15006_026' into maint-0.2.6
|
2015-03-09 13:05:27 -04:00 |
|
|
Nick Mathewson
|
42d877f084
|
Changes file for 15188
|
2015-03-09 11:13:57 -04:00 |
|
|
Nick Mathewson
|
a7f75b2056
|
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
|
2015-03-09 11:09:49 -04:00 |
|
|
Nick Mathewson
|
1a7419c3df
|
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
|
2015-03-09 11:09:30 -04:00 |
|
|
Nick Mathewson
|
6704e18dd2
|
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
|
2015-03-09 11:08:57 -04:00 |
|
|
Nick Mathewson
|
addffcc14d
|
Adjust changes header
|
2015-03-09 11:07:50 -04:00 |
|
|
Nick Mathewson
|
de2c5ad815
|
Revert "Missing dependencies; fixes 15127."
This reverts commit 930ab95e1f.
|
2015-03-04 15:18:33 +01:00 |
|
|
Nick Mathewson
|
a726cd76df
|
Merge remote-tracking branch 'public/bug15064_025' into maint-0.2.6
|
2015-03-04 12:26:43 +01:00 |
|
|
Nick Mathewson
|
681802817d
|
Make TransProxyType ipfw work correctly
Fixes bug 15064; bugfix on 0.2.5.4-alpha.
|
2015-03-04 12:25:52 +01:00 |
|
|
Nick Mathewson
|
c5c4ea2db0
|
Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.6
|
2015-03-04 12:19:28 +01:00 |
|
|
Nick Mathewson
|
d5b2cbea10
|
Add wait4 to the seccomp2 sandbox allowable syscall list
fixes bug 15088. patch from sanic.
|
2015-03-04 12:18:10 +01:00 |
|
|
Nick Mathewson
|
5ad47aafab
|
Merge remote-tracking branch 'public/bug15127_025' into maint-0.2.6
|
2015-03-04 12:14:17 +01:00 |
|
|
Nick Mathewson
|
2d926d0147
|
only declare rv when it is used in destination_from_socket. Fixes 15151
|
2015-03-04 12:12:41 +01:00 |
|
|
Nick Mathewson
|
930ab95e1f
|
Missing dependencies; fixes 15127.
|
2015-03-04 12:09:33 +01:00 |
|
|
Nick Mathewson
|
81a994ce77
|
Make the assert related to 15083 a tiny bit more tolerant
|
2015-03-03 22:25:26 +01:00 |
|
|
Nick Mathewson
|
71ee53fe9b
|
Do not leave empty, invalid chunks in buffers during buf_pullup
This fixes an assertion failure bug in 15083; bugfix on 0.2.0.10-alpha.
Patch from 'cypherpunks'
|
2015-03-03 22:21:41 +01:00 |
|
|
Nick Mathewson
|
79c69d18b7
|
Include a HOST item in BOOTSTRAP problem messages
Closes ticket 15006.
|
2015-02-27 11:28:30 -05:00 |
|
|
Nick Mathewson
|
0f2f8fd68a
|
changes file for 15037
|
2015-02-26 15:24:43 -05:00 |
|
|
Nick Mathewson
|
d7fcaca3fc
|
Have zero_length_keys.sh use an empty torrc file.
Fixes 15033; bugfix on 0.2.6.3-alpha.
|
2015-02-26 15:22:37 -05:00 |
|
|
Nick Mathewson
|
2bcb596dcf
|
Merge remote-tracking branch 'public/bug14129_024' into maint-0.2.4
|
2015-02-24 13:23:44 -05:00 |
|
|
Nick Mathewson
|
fec73c876b
|
Add sections to changes files; please lintchanges
|
2015-02-24 11:51:59 -05:00 |
|
|
Nick Mathewson
|
d5aee5e9a5
|
changes file for ticket 14950
|
2015-02-24 11:11:17 -05:00 |
|
|
Nick Mathewson
|
098cbcbb9e
|
Merge branch 'bug14989'
|
2015-02-23 13:03:07 -05:00 |
|
|
Nick Mathewson
|
21ac0cd2af
|
Let AF_UNIX connections through the sandbox
Fixes bug 15003; bugfix on 0.2.6.3-alpha.
|
2015-02-23 12:35:20 -05:00 |
|
|
Nick Mathewson
|
f1fa85ea73
|
Fix running with the seccomp2 sandbox
We had a regression in 0.2.6.3-alpha when we stopped saying
IPPROTO_TCP to socket(). Fixes bug 14989, bugfix on 0.2.6.3-alpha.
|
2015-02-23 12:16:08 -05:00 |
|
|
Nick Mathewson
|
7a1a0a4cd7
|
Merge remote-tracking branch 'public/bug14988_025'
|
2015-02-23 11:33:07 -05:00 |
|
|
Nick Mathewson
|
aeb38bbdce
|
add another unused-var marker in backtrace.c for 14988
|
2015-02-23 11:32:04 -05:00 |
|
|
Nick Mathewson
|
cf7aa7b926
|
changes file for 5246e8f992
|
2015-02-23 11:24:13 -05:00 |
|
 rl1987
|
385558c32f
|
Fix endianness issues in test_config_resolve_my_address().
Since resolve_my_address() yields IP address in host order there is
no need to use byteorder functions for conversion.
|
2015-02-23 09:57:17 -05:00 |
|
|
Nick Mathewson
|
8a9d86bf05
|
Merge remote-tracking branch 'public/bug11454_11457'
|
2015-02-20 01:08:12 -05:00 |
|
|
Nick Mathewson
|
03a4e97c76
|
Merge remote-tracking branch 'origin/maint-0.2.5'
|
2015-02-20 01:05:21 -05:00 |
|
|
Nick Mathewson
|
1525eeeb49
|
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
|
2015-02-20 01:04:49 -05:00 |
|
|
Nick Mathewson
|
7b03e9a8c7
|
fold one more entry into the changelog
|
2015-02-19 11:36:27 -05:00 |
|
|
Nick Mathewson
|
76d8c23ab4
|
Try to fix authdir_newdesc events
We were sending values that were truncated by the length of the
annotations.
|
2015-02-19 11:35:27 -05:00 |
|
|
Nick Mathewson
|
0cdc321ae9
|
Merge changes into changelog
|
2015-02-19 09:56:38 -05:00 |
|
|
Nick Mathewson
|
4fde9cdf86
|
appease lintchanges
|
2015-02-19 09:55:18 -05:00 |
|