11f63d26ac
Update dannenberg's V3 authority identity fingerprint
...
This new identity key was changed on 18 November 2015.
2016-01-07 09:39:04 -08:00
400df18688
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-01-07 09:14:05 -08:00
ae223138fb
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-01-07 09:13:54 -08:00
1496056c12
Update geoip and geoip6 to the January 5 2016 database.
2016-01-07 11:10:37 +01:00
1adc2bf66f
Merge branch 'maint-0.2.5' into maint-0.2.6
2015-12-08 10:20:21 -05:00
c3d11b119d
Merge branch 'maint-0.2.4' into maint-0.2.5
2015-12-08 10:20:14 -05:00
35deb4d442
Merge branch 'bug17772_024' into maint-0.2.4
2015-12-08 10:18:31 -05:00
5138f5ca69
Ensure node is a guard candidate when picking a directory guard
2015-12-08 09:49:01 -05:00
b53ff86067
Merge branch 'maint-0.2.5' into maint-0.2.6
2015-12-08 09:43:25 -05:00
4328525770
Merge branch 'maint-0.2.4' into maint-0.2.5
2015-12-08 09:38:48 -05:00
b0867fec96
Fix a compilation warning introduced by clang 3.6
...
There was a dead check when we made sure that an array member of a
struct was non-NULL. Tor has been doing this check since at least
0.2.3, maybe earlier.
Fixes bug 17781.
2015-12-08 09:37:05 -05:00
089ee13534
Merge branch 'maint-0.2.5' into maint-0.2.6
2015-12-07 10:10:44 -05:00
e8e89fd7a1
Merge branch 'maint-0.2.4' into maint-0.2.5
2015-12-07 10:10:21 -05:00
dbb919cf94
Update geoip and geoip6 to the December 1 2015 database.
2015-12-05 17:02:59 +01:00
9459ae260e
Fix the return value
2015-10-21 12:01:05 -04:00
35bf07b8d6
Check for len < 4 in dn_indicates_v3_cert
...
Without this check, we potentially look up to 3 characters before
the start of a malloc'd segment, which could provoke a crash under
certain (weird afaik) circumstances.
Fixes 17404; bugfix on 0.2.6.3-alpha.
2015-10-21 11:44:43 -04:00
2ec5e24c58
Add hidserv-stats filname to our sandbox filter
...
Fixes #17354
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-10-15 13:42:34 -04:00
552136668c
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-10-09 10:14:46 -04:00
6ba5480bc1
Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6
2015-10-09 10:13:28 -04:00
3569cffe14
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-10-09 10:12:59 -04:00
62b02a1941
Update geoip and geoip6 to the October 9 2015 database.
2015-10-09 15:27:55 +02:00
fb5a858a35
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-09-24 10:06:15 -04:00
809217e6f3
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-09-24 10:06:00 -04:00
8b3e0b7729
Update geoip and geoip6 to the September 3 2015 database.
2015-09-24 15:08:15 +02:00
9d86f6665a
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-07-29 10:48:13 -04:00
01bb260f31
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-07-29 10:47:07 -04:00
7004d67430
Update geoip and geoip6 to the July 8 2015 database.
2015-07-29 15:49:04 +02:00
9aa7ebca29
Merge branch 'maint-0.2.6' into release-0.2.6
2015-07-12 16:37:33 -04:00
9d1801b4b9
Bump maint-0.2.6 to 0.2.6.10-dev
2015-07-12 16:37:20 -04:00
58c51dc608
Pick today as the release date; copy changes into ReleaseNotes
2015-07-12 16:14:43 -04:00
3c4cbcb073
Re-run format_changelog
2015-07-12 16:07:53 -04:00
014f860205
Arma moved a paren into a better, but not grammatical, place. Fix that.
...
According to all the usage guides I have, parentheses should contain
the close-of-sentence punctuation only when the whole sentence is in
parentheses. So you would write this sentence like this (because
it's correct). (Does that make sense?)
2015-07-12 16:05:39 -04:00
24f056c25d
tiny changelog updates
...
the only substantive one was moving a paren around in the #16381 entry.
2015-07-12 15:24:48 -04:00
4bae17e57d
Edit changelog
2015-07-12 14:07:00 -04:00
3085343783
Merge branch 'maint-0.2.6' into release-0.2.6
2015-07-12 13:33:52 -04:00
3d0c09019f
Bump maint-0.2.6 to 0.2.6.10
2015-07-12 13:33:47 -04:00
aff40531cb
Finish one of my classic sentences where I had omitted an
2015-07-12 13:30:19 -04:00
e02a643009
Collate and format entries for changelog for 0.2.6.10
...
More editing needed.
2015-07-12 13:29:06 -04:00
2cdef2bb34
Merge branch 'maint-0.2.6' into release-0.2.6
2015-07-10 11:54:49 -04:00
418b6f8197
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-06-25 11:43:17 -04:00
fd082c394b
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-06-25 11:43:04 -04:00
fde4199e1c
Merge remote-tracking branch 'karsten/geoip6-jun2015' into maint-0.2.4
2015-06-25 11:42:47 -04:00
cb8c5c023f
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-06-25 11:42:31 -04:00
23a95986ce
Merge branch 'maint-0.2.6' into release-0.2.6
2015-06-25 11:20:11 -04:00
1c1d71fe1a
Merge remote-tracking branch 'public/bug16013_025' into maint-0.2.6
2015-06-25 11:14:44 -04:00
68eaaed798
Avoid crashing on busy/NEWNYM+hidden service clients
...
When we ran out of intro points for a hidden service (which could
happen on a newnym), we would change the connection's state back to
"waiting for hidden service descriptor." But this would make an
assertion fail if we went on to call circuit_get_open_circ_or_launch
again.
This fixes bug 16013; I believe the bug was introduced in
38be533c69
2015-06-25 11:10:43 -04:00
03e3cf6a7a
Merge remote-tracking branch 'public/bug16400_026' into maint-0.2.6
2015-06-25 10:40:58 -04:00
e0b7598833
Repair breakage in early-error case of microdesc parsing
...
When I fixed #11243 , I made it so we would take the digest of a
descriptor before tokenizing it, so we could desist from download
attempts if parsing failed. But when I did that, I didn't remove an
assertion that the descriptor began with "onion-key". Usually, this
was enforced by "find_start_of_next_microdescriptor", but when
find_start_of_next_microdescriptor returned NULL, the assertion was
triggered.
Fixes bug 16400. Thanks to torkeln for reporting and
cypherpunks_backup for diagnosing and writing the first fix here.
2015-06-22 13:51:56 -04:00
f18ee7fc72
Merge remote-tracking branch 'dgoulet/bug16381_026_01-revert' into maint-0.2.6
2015-06-18 11:30:01 -04:00
c8cb55659a
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-06-17 09:18:45 -04:00
teor (Tim Wilson-Brown)
Nick Mathewson
Karsten Loesing
Arlo Breault
David Goulet
Roger Dingledine