Nick Mathewson
ec29cae8d7
Merge branch 'maint-0.3.1'
2017-07-13 16:52:20 -04:00
Nick Mathewson
1ea155b28f
Merge branch 'bug22520_031' into maint-0.3.1
2017-07-13 16:52:16 -04:00
Nick Mathewson
c73b35d428
Merge branch 'maint-0.3.1'
2017-07-13 16:51:18 -04:00
Nick Mathewson
e6d2059751
Merge remote-tracking branch 'isis/bug22830_0.3.1' into maint-0.3.1
2017-07-13 16:51:09 -04:00
Isis Lovecruft
c59ba01550
rephist: Remove unused crypto_pk statistics.
...
These statistics were largely ununsed, and kept track of statistical information
on things like how many time we had done TLS or how many signatures we had
verified. This information is largely not useful, and would only be logged
after receiving a SIGUSR1 signal (but only if the logging severity level was
less than LOG_INFO).
* FIXES #19871 .
* REMOVES note_crypto_pk_op(), dump_pk_op(), and pk_op_counts from
src/or/rephist.c.
* REMOVES every external call to these functions.
2017-07-13 20:24:48 +00:00
Isis Lovecruft
8de1b94b9d
Add a changes file for bug22830.
2017-07-13 18:16:22 +00:00
Nick Mathewson
3aba8490ba
Merge branch 'maint-0.3.1'
2017-07-12 10:16:06 -04:00
Nick Mathewson
5636b160d4
Merge branch 'bug22349_029' into maint-0.3.1
2017-07-12 10:15:49 -04:00
Nick Mathewson
4984d6242a
Merge branch 'maint-0.3.1'
2017-07-12 09:24:01 -04:00
Nick Mathewson
e111cfcd54
Restore openssl and libscrypt includes in test_crypto_slow.c
...
This reverts part of commit 706c44a6ce
2017-07-12 09:23:15 -04:00
Nick Mathewson
7b2364035a
Merge branch 'maint-0.3.1'
2017-07-10 15:27:16 -04:00
Matt Traudt
1ff98a7e89
Make consdiff tests pass on OS X too
2017-07-10 15:27:01 -04:00
Nick Mathewson
948158df33
Merge branch 'bug17750_029_squashed'
2017-07-07 13:28:22 -04:00
teor
c21cfd28f4
Make clients try fallbacks before authorities
...
Make clients wait for 6 seconds before trying to download their
consensus from an authority.
Fixes bug 17750, bugfix on 0.2.8.1-alpha.
2017-07-07 13:18:04 -04:00
Nick Mathewson
63ceadb485
Use LANG_ENGLISH in windows error messages
...
This change prevents us from generating corrupt messages when we
are confused about codepage settings, and makes Windows errors
consistent with the rest of our logs.
Fixes bug 22520; bugfix on 0.1.2.8-alpha. Patch from "Vort".
2017-07-07 13:12:45 -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
2dd1e21212
Merge branch 'maint-0.2.9' into maint-0.3.0
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
c1e4aff384
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-07-07 10:51:28 -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
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
86eb63deb4
Merge remote-tracking branch 'public/bug19648'
2017-07-06 09:32:22 -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
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
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
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
46e83477c1
Merge branch 'bug15554_032_01_squashed'
2017-07-05 10:15:24 -04:00
Nick Mathewson
78ac713d60
changes file for 15554
2017-07-05 10:15:17 -04:00
Nick Mathewson
13ccca69f1
Merge branch 'onionskin_refactor_2'
2017-07-05 10:01:48 -04:00
Nick Mathewson
ef56f073c1
changes file for 22804
2017-07-05 10:01:40 -04:00
Nick Mathewson
093f57cb16
changes file for bug 22750
2017-07-05 09:57:48 -04:00
