Nick Mathewson
c1bdc3b10e
Merge branch 'maint-0.3.0' into maint-0.3.1
...
This is an "ours" commit to avoid taking the fix for 22838,
which we already have here.
2017-07-07 10:57:05 -04:00
Nick Mathewson
ed0fb21834
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-07-07 10:56:31 -04:00
Nick Mathewson
66c85cd881
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-07-07 10:56:31 -04:00
Nick Mathewson
48e45e2fb1
Merge branch 'bug22838_028' into maint-0.2.8
2017-07-07 10:55:51 -04:00
Nick Mathewson
ae756f251f
mingw fix: avoid "unused var" warning.
...
This is a backport of 19615bce64
2017-07-07 10:54:24 -04:00
Nick Mathewson
5472066cd2
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-07-07 10:51:28 -04:00
Nick Mathewson
9e4b6986f9
Merge branch 'maint-0.3.1'
2017-07-07 10:51:28 -04:00
Nick Mathewson
0e5cf4a215
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-07-07 10:51:28 -04:00
Nick Mathewson
4858cda2df
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-07-07 10:51:28 -04:00
Nick Mathewson
2dd1e21212
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-07-07 10:51:28 -04:00
Nick Mathewson
c1e4aff384
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-07-07 10:51:28 -04:00
Nick Mathewson
715185477d
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-07-07 10:51:28 -04:00
Nick Mathewson
78dfa76ddc
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-07-07 10:51:28 -04:00
Nick Mathewson
b47249e0bb
Mention TROVE-2017-007 in changes file for 22789
2017-07-07 10:51:25 -04:00
Nick Mathewson
66c1bc9fab
Use the correct TROVE id for #22753 .
2017-07-07 10:49:48 -04:00
Nick Mathewson
86eb63deb4
Merge remote-tracking branch 'public/bug19648'
2017-07-06 09:32:22 -04:00
Nick Mathewson
720552b04c
Merge remote-tracking branch 'chelseakomlo/coding-standards-22762'
2017-07-06 09:30:40 -04:00
Nick Mathewson
139799cdce
Merge branch 'bug20488_029_squashed'
2017-07-06 09:29:03 -04:00
Nick Mathewson
41fe94ef15
Improve warning message to stop implying nickname reg is a thing.
...
Closing ticket 20488.
2017-07-06 09:28:31 -04:00
Nick Mathewson
68a2c75ab7
Merge branch 'maint-0.3.1'
2017-07-05 17:37:14 -04:00
Nick Mathewson
9919638e98
Fix a wide line from 22207
2017-07-05 17:37:06 -04:00
Nick Mathewson
93bd60e5b0
Merge branch 'maint-0.3.1'
2017-07-05 17:00:46 -04:00
Nick Mathewson
2251667ff2
Merge remote-tracking branch 'karsten/task-22207' into maint-0.3.1
2017-07-05 17:00:43 -04:00
Nick Mathewson
55777b3ff9
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-07-05 16:11:48 -04:00
Nick Mathewson
0dc7d68bb5
Merge branch 'maint-0.3.1'
2017-07-05 16:11:48 -04:00
Nick Mathewson
15b13578e8
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-07-05 16:11:48 -04:00
Nick Mathewson
dfc0614840
Only disable -Wfloat-conversion on mingw when it exists.
...
The 22081 fix disabled -Wfloat-conversion, but -Wfloat-conversion
didn't exist in every relevant mingw; it was added in GCC 4.9.x some
time, if the documentation can be trusted.
Bug not in any released version of tor.
2017-07-05 16:10:45 -04:00
Nick Mathewson
a85ee62e74
Make the strings from #1667 static.
2017-07-05 15:59:17 -04:00
Nick Mathewson
13024c7932
Merge branch 'maint-0.3.1'
2017-07-05 15:57:09 -04:00
Nick Mathewson
9383fa3851
Fix mixed-sign comparison warning in fix for 22797.
2017-07-05 15:56:57 -04:00
Nick Mathewson
759154b1ad
Fix unit test memory leak in certs_ok_ed25519.
...
Fixes bug 22803; bugfix on 0.3.0.1-alpha.
2017-07-05 15:42:25 -04:00
Nick Mathewson
546f5b364b
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-07-05 13:43:31 -04:00
Nick Mathewson
15fddaffd5
Merge branch 'maint-0.3.1'
2017-07-05 13:43:31 -04:00
Nick Mathewson
5434b2451e
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-07-05 13:43:31 -04:00
Nick Mathewson
32c0066e4b
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-07-05 13:43:21 -04:00
Nick Mathewson
5ff0f1ab9e
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-07-05 13:42:47 -04:00
Nick Mathewson
6cd6d488dc
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-07-05 13:42:37 -04:00
Nick Mathewson
f6420bceec
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-07-05 13:42:32 -04:00
Nick Mathewson
ff8c230d7c
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-07-05 13:42:26 -04:00
Nick Mathewson
0ee15c92d5
Merge branch 'bug22789_024' into maint-0.2.4
2017-07-05 13:41:27 -04:00
Nick Mathewson
8bc70a2ad2
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-07-05 11:19:03 -04:00
Nick Mathewson
d4f08c74fe
Merge branch 'maint-0.3.1'
2017-07-05 11:19:03 -04:00
Nick Mathewson
0f97f963e3
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-07-05 11:19:03 -04:00
Nick Mathewson
bb97f680e7
Merge branch 'bug22801_028' into maint-0.2.9
2017-07-05 11:18:59 -04:00
Nick Mathewson
e04cc7e27f
Merge branch 'maint-0.3.1'
2017-07-05 11:16:51 -04:00
Nick Mathewson
e88aa98451
Merge branch 'teor-bug22797-025' into maint-0.3.1
2017-07-05 11:16:30 -04:00
teor
878e0d45a5
Always allow extra file descriptors when setting the connection maximum
...
When setting the maximum number of connections allowed by the OS,
always allow some extra file descriptors for other files.
Fixes bug 22797; bugfix on 0.2.0.10-alpha.
2017-07-05 11:15:10 -04:00
Nick Mathewson
cd77ea782e
Merge branch 'neena-fix-1667'
2017-07-05 11:01:36 -04:00
Nick Mathewson
03b6cfd591
Extract "not an HTTP proxy" messages.
2017-07-05 11:01:17 -04:00
Nick Mathewson
46e83477c1
Merge branch 'bug15554_032_01_squashed'
2017-07-05 10:15:24 -04:00
