 Andrea Shepard
|
1218d731d1
Merge branch 'bug16248_027' into maint-0.2.7
|
vor 10 Jahren |
 Nick Mathewson
|
e1e62f9d57
Merge branch 'ed25519_voting_fixes_squashed' into maint-0.2.7
|
vor 10 Jahren |
|
Nick Mathewson
|
2f2fba8a91
Use nth consistently in dircollate.h.
|
vor 10 Jahren |
|
Nick Mathewson
|
b24f15a9a1
In routers_make_ed_keys_unique, break ties for published_on
|
vor 10 Jahren |
|
Nick Mathewson
|
beef6ed451
Assert that dircollator is collated when we're reading its output.
|
vor 10 Jahren |
|
Nick Mathewson
|
48f8229504
After we strip out duplicate entries from 'routers', don't use 'rl'.
|
vor 10 Jahren |
|
Nick Mathewson
|
fa07c60c67
Fix another case of 17668: Add NoEdConsensus
|
vor 10 Jahren |
|
Nick Mathewson
|
60ca3f358f
Document has_ed25519_listing
|
vor 10 Jahren |
|
Nick Mathewson
|
13a31e72db
Never vote for an ed key twice.
|
vor 10 Jahren |
|
Nick Mathewson
|
c20e34e189
Fix log message subjects in networkstatus_parse_vote_from_string()
|
vor 10 Jahren |
|
Nick Mathewson
|
6182e34628
Document dircollate.c (and remove an unused global)
|
vor 10 Jahren |
|
Nick Mathewson
|
920e3d6a19
a couple more changes files issues.
|
vor 10 Jahren |
|
Nick Mathewson
|
ee08f22489
Fix some warnings from lintchanges.
|
vor 10 Jahren |
|
Nick Mathewson
|
307b863556
Add comments to connection_check_event().
|
vor 10 Jahren |
|
Nick Mathewson
|
91d7cf50c6
Change behavior on missing/present event to warn instead of asserting.
|
vor 10 Jahren |
|
Nick Mathewson
|
e79da62645
If we start/stop reading on a dnsserv connection, don't assert.
|
vor 10 Jahren |
|
Nick Mathewson
|
17cfdb358c
Merge branch 'maint-0.2.6' into maint-0.2.7
|
vor 10 Jahren |
|
Nick Mathewson
|
443dddb749
Merge branch 'maint-0.2.5' into maint-0.2.6
|
vor 10 Jahren |
|
Nick Mathewson
|
21f9829e79
Merge branch 'maint-0.2.4' into maint-0.2.5
|
vor 10 Jahren |
 Karsten Loesing
|
8e2640b15a
Update geoip and geoip6 to the March 3 2016 database.
|
vor 10 Jahren |
|
Nick Mathewson
|
67e5d49d8a
Make clang asan work with FORTIFIED_SOURCE again.
|
vor 10 Jahren |
|
Nick Mathewson
|
60efce445b
Enable ed25519 collator in voting.
|
vor 10 Jahren |
|
Nick Mathewson
|
be6174f8f6
Merge branch 'maint-0.2.6' into maint-0.2.7
|
vor 10 Jahren |
|
Nick Mathewson
|
740421af19
Merge branch 'maint-0.2.5' into maint-0.2.6
|
vor 10 Jahren |
|
Nick Mathewson
|
ce289e2cb5
Merge branch 'maint-0.2.4' into maint-0.2.5
|
vor 10 Jahren |
|
Nick Mathewson
|
ad95d64fec
Merge branch 'bug18162_024' into maint-0.2.4
|
vor 10 Jahren |
|
Nick Mathewson
|
c2fd648469
Make ensure_capacity a bit more pedantically correct
|
vor 10 Jahren |
|
Nick Mathewson
|
d920cbb82c
Merge branch 'maint-0.2.6' into maint-0.2.7
|
vor 10 Jahren |
|
Nick Mathewson
|
44ad3be221
Merge branch 'maint-0.2.5' into maint-0.2.6
|
vor 10 Jahren |
|
Nick Mathewson
|
f06d9a9cef
Merge branch 'maint-0.2.4' into maint-0.2.5
|
vor 10 Jahren |
