Nick Mathewson
dec7dc3d82
Merge remote-tracking branch 'dgoulet/ticket20656_030_01'
2017-02-14 19:15:10 -05:00
Nick Mathewson
7e469c1002
Merge branch 'bug20894_029_v3'
2017-02-14 19:10:20 -05:00
Nick Mathewson
4c1ecd7583
fixup! Don't atoi off the end of a buffer chunk.
...
Use STATIC.
2017-02-14 16:45:18 -05:00
Nick Mathewson
ff088ea7d7
fixup! Don't atoi off the end of a buffer chunk.
...
Credit AFL in the changes file.
2017-02-14 16:44:58 -05:00
Nick Mathewson
c4f2faf301
Don't atoi off the end of a buffer chunk.
...
Fixes bug 20894; bugfix on 0.2.0.16-alpha.
We already applied a workaround for this as 20834, so no need to
freak out (unless you didn't apply 20384 yet).
2017-02-14 16:38:47 -05:00
David Goulet
3f005c0433
protover: Add new version for prop224 for HSIntro/HSDir
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-02-14 10:51:18 -05:00
Nick Mathewson
dca8ae5cfa
Merge remote-tracking branch 'dgoulet/bug21116_030_01'
2017-02-13 15:56:01 -05:00
Roger Dingledine
b421b3f621
Merge branch 'maint-0.2.9'
2017-02-13 15:41:56 -05:00
Roger Dingledine
4a2afd5b33
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-02-13 15:41:20 -05:00
Roger Dingledine
9ff76185d2
Merge branch 'maint-0.2.7' into maint-0.2.8
2017-02-13 15:39:13 -05:00
Roger Dingledine
5c4235888a
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-02-13 15:28:50 -05:00
Roger Dingledine
e778a411b9
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-13 15:27:57 -05:00
Roger Dingledine
144ec3d58c
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-13 15:23:50 -05:00
Roger Dingledine
635c5a8a92
be sure to remember the changes file for #20384
2017-02-13 15:22:36 -05:00
Nick Mathewson
d9827e4729
Merge branch 'maint-0.2.9'
2017-02-13 14:41:43 -05:00
Nick Mathewson
a86f95df5c
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-02-13 14:38:03 -05:00
Nick Mathewson
9b90d515a9
Merge branch 'maint-0.2.7' into maint-0.2.8
2017-02-13 14:37:55 -05:00
Nick Mathewson
75fe218b16
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-02-13 14:37:49 -05:00
Nick Mathewson
43c18b1b7a
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-13 14:37:42 -05:00
Nick Mathewson
124062e843
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-13 14:37:01 -05:00
Karsten Loesing
f6016058b4
Update geoip and geoip6 to the February 8 2017 database.
2017-02-12 15:56:31 +01:00
Nick Mathewson
2670844b2b
whoops, removed a semicolon :(
2017-02-09 10:59:48 -05:00
Nick Mathewson
f594bdb3ad
One more prop271 XXX.
2017-02-09 10:52:47 -05:00
Nick Mathewson
14c2a1f403
Update some more XXXXprop271 comments to refer to actual tickets or to be up-to-date
2017-02-09 10:48:28 -05:00
Nick Mathewson
3919f4f529
Remove an XXXprop271 comment: turns out we didn't need a tristate
2017-02-09 10:30:20 -05:00
Nick Mathewson
d15273e9f5
Change "prop271" in XXXXs about guard Ed identity to refer to #20872 .
2017-02-09 10:29:02 -05:00
Nick Mathewson
fe76741021
Remove a suggestion in an XXX271 comment; it is now 21424.
2017-02-09 10:25:32 -05:00
Nick Mathewson
41f880c396
Remove an XXXprop271 comment that has been replaced by #21423
2017-02-09 10:13:54 -05:00
Nick Mathewson
875e5ee3f7
Revise an XXXprop271 comment -- it has been superseded by #21422
2017-02-09 10:11:44 -05:00
Nick Mathewson
58208457a6
Remove an XXXprop271 comment -- it has been replaced by #21421
2017-02-09 10:07:56 -05:00
Nick Mathewson
f263cf954a
Remove a redundant XXX271 comment
2017-02-09 09:57:39 -05:00
David Goulet
e129393e40
test: Add missing socket errno in test_util.c
...
According to 21116, it seems to be needed for Wheezy Raspbian build. Also,
manpage of socket(2) does confirm that this errno value should be catched as
well in case of no support from the OS of IPv4 or/and IPv6.
Fixes #21116
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-02-08 09:00:48 -05:00
Nick Mathewson
9a9f4ffdfa
Merge branch 'maint-0.2.9'
2017-02-07 10:39:36 -05:00
Nick Mathewson
23f1caf2af
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-02-07 10:39:23 -05:00
Nick Mathewson
eca4a89319
Merge branch 'maint-0.2.7' into maint-0.2.8
2017-02-07 10:39:13 -05:00
Nick Mathewson
4bce2072ac
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-02-07 10:39:03 -05:00
Nick Mathewson
f2a30413a3
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-07 10:37:53 -05:00
Nick Mathewson
2ce4330249
Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5
2017-02-07 10:37:43 -05:00
Nick Mathewson
c056d19323
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-07 10:37:31 -05:00
Nick Mathewson
85a2487f97
Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix
2017-02-07 09:49:23 -05:00
Nick Mathewson
cfeb1db2fb
Add comments to connection_check_event().
2017-02-07 09:48:24 -05:00
Nick Mathewson
457d38a6e9
Change behavior on missing/present event to warn instead of asserting.
...
Add a changes file.
2017-02-07 09:48:19 -05:00
Nick Mathewson
650c03127a
If we start/stop reading on a dnsserv connection, don't assert.
...
Fixes bug 16248. Patch from cypherpunks. Bugfix on 0.2.0.1-alpha.
2017-02-07 09:48:13 -05:00
Nick Mathewson
274094b0d7
Merge branch 'maint-0.2.9'
2017-02-07 09:30:26 -05:00
Nick Mathewson
65cda78ec6
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-02-07 09:30:19 -05:00
Nick Mathewson
a9f936d0d7
Merge branch 'maint-0.2.7' into maint-0.2.8
2017-02-07 09:30:10 -05:00
Nick Mathewson
86d5a6fac0
Merge branch 'maint-0.2.6' into maint-0.2.7
...
"ours" merge to avoid reverting 17354, which was already fixed in
0.2.7.4-rc.
2017-02-07 09:29:27 -05:00
Nick Mathewson
5446cb8d3d
Revert "Add hidserv-stats filname to our sandbox filter"
...
Reverting this in 0.2.6 only -- we're no backporting
seccomp2-loosening fixes to 0.2.6.
This reverts commit 2ec5e24c58
2017-02-07 09:28:50 -05:00
Nick Mathewson
ea2f08ac7f
(this already went in to 0.3.0.3-alpha)
2017-02-07 09:27:37 -05:00
Nick Mathewson
51dc284088
Merge branch 'maint-0.2.9'
2017-02-07 09:27:22 -05:00
