summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2015-01-23Merge branch 'if_addr_refactoring_squashed'Nick Mathewson
Conflicts: src/test/include.am src/test/test.c
2015-01-23Refactor code that looks up addresses from interfacesrl1987
Now the code has separate implementation and examination functions, uses smartlists sanely, and has relatively decent test coverage.
2015-01-23Tweak the 9969 fix a littleNick Mathewson
If we have busy nodes and excluded nodes, then don't retry with the excluded ones enabled. Instead, wait for the busy ones to be nonbusy.
2015-01-23Merge remote-tracking branch 'public/ticket9969'Nick Mathewson
Conflicts: src/or/directory.c src/or/routerlist.c src/or/routerlist.h src/test/include.am src/test/test.c
2015-01-23Merge remote-tracking branch 'public/ticket13762'Nick Mathewson
2015-01-23Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2015-01-23Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-01-23Merge remote-tracking branch 'karsten/geoip6-jan2015' into maint-0.2.4Nick Mathewson
2015-01-23Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2015-01-22fix some warnings in compat_threads.cNick Mathewson
2015-01-22Move a redundant _GNU_SOURCE to where it is not redundantNick Mathewson
2015-01-22Update geoip6 to the January 7 2015 database.Karsten Loesing
2015-01-22Update geoip to the January 7 2015 database.Karsten Loesing
2015-01-21use the correct free fn. spotted by dgouletNick Mathewson
2015-01-21Merge branch 'better_workqueue_v3_squashed'Nick Mathewson
2015-01-21Fix: remove whitespace and update a comment in cpuworker.cDavid Goulet
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-01-21Fix: change copyright year in workqueue and thread testsDavid Goulet
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-01-21Support monotonic time for pthread_cond_timedwaitDavid Goulet
This is to avoid that the pthread_cond_timedwait() is not affected by time adjustment which could make the waiting period very long or very short which is not what we want in any cases. Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-01-21Merge branch 'bug9819'Nick Mathewson
2015-01-21fix a commentNick Mathewson
2015-01-21Fix up some workqueue/threading issues spotted by dgoulet.Nick Mathewson
2015-01-21handle EINTR in compat_*threads.cNick Mathewson
2015-01-20Merge branch 'bug14084'Nick Mathewson
2015-01-20Merge remote-tracking branch 'dgoulet/bug14224_025_v1'Nick Mathewson
2015-01-20Merge branch 'ticket14254_squashed'Nick Mathewson
2015-01-20Fix SocksSocket 0. That was easy!Nick Mathewson
2015-01-19Some days I just can't C.Nick Mathewson
2015-01-19Make check-spaces happier.Nick Mathewson
2015-01-19Remove a now-needless testing workaround.Nick Mathewson
2015-01-19Replace a 4 with a 6; fix a bug that nobody noticed :/Nick Mathewson
Fixes 14280 bugfix on 1053af0b9c4127873034a935ce33 in 0.2.4.7-alpha.
2015-01-19Merge branch 'bug7555_v2_squashed'Nick Mathewson
Conflicts: src/or/connection_edge.c
2015-01-19Add a bunch of new comments to explain connection_ap_rewrite{,_and_attach}Nick Mathewson
Also, do a little light refactoring to move some variable declarations around and make a few things const Also fix an obnoxious bug on checking for the DONE stream end reason. It's not a flag; it's a possible value or a variable that needs to be masked.
2015-01-19Fix: close intro circuit if no more intro points are usableDavid Goulet
Once a NACK is received on the intro circuit, tor tries an other usable one by extending the current circuit to it. If no more intro points are usable, now close the circuit. Also, it's reason is changed before closing it so we don't report again an intro point failure and trigger an extra HS fetch. Fixes #14224 Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-01-19Fix: close intro circuit if no more intro points are usableDavid Goulet
Once a NACK is received on the intro circuit, tor tries an other usable one by extending the current circuit to it. If no more intro points are usable, now close the circuit. Fixes #14224 Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-01-18Merge remote-tracking branch 'public/ticket13037'Nick Mathewson
Conflicts: src/or/config.c
2015-01-18Remove the unused rend_cache_entry_t->received field.Roger Dingledine
(Patch from arma, commit message from nick.) Closes #14222.
2015-01-18Merge remote-tracking branch 'public/bug14219_025'Nick Mathewson
2015-01-18Do not replace a HS descriptor with a different replica of itselfRoger Dingledine
This fixes a bug where we'd fetch different replicas of the same descriptor for a down hidden service over and over, until we got lucky and fetched the same replica twice in a row. Fixes bug 14219; bugfix on 0.2.0.10-alpha. (Patch from Roger; commit message and changes file by Nick.)
2015-01-18Merge remote-tracking branch 'public/bug14261_025'Nick Mathewson
Conflicts: src/or/directory.c
2015-01-18Increase limit for status vote download size by a factor of 5.Nick Mathewson
We've started to hit the limit here. We introduced the limit in 0.1.2.5-alpha. This fixes bug 14261, but we should have a smarter way to not actually do the behavior this permits. See #14267 for a ticket about fixing that.
2015-01-18Fix memory leak in connection_ap_handshake_rewrite_and_attach()Nick Mathewson
Spotted by asn. #14259. Bugfix on 368eb6a97 in 0.2.0.1-alpha.
2015-01-18Merge remote-tracking branch 'public/bug12485'Nick Mathewson
2015-01-16fix another mingw64 unit test warninNick Mathewson
2015-01-16changes suggested by weaselNick Mathewson
2015-01-16Unify parse_unix_socket_config and parse_port_configNick Mathewson
This incidentally makes unix SocksSocket support all the same options as SocksPort. This patch breaks 'SocksSocket 0'; next will restore it. Resolves 14254.
2015-01-16No, client-side DNS cacheing should not be on by default.Nick Mathewson
2015-01-16Merge branch 'bug8546_squashed'Nick Mathewson
Conflicts: src/or/connection.c src/or/or.h src/or/relay.c
2015-01-16Replace field-by-field copy with memcpy for entry_port_cfgNick Mathewson
2015-01-16Move entry_port_cfg_t fields in entry_connection_tNick Mathewson
Also rename some options for uniformity, and apply this script: @@ entry_connection_t *conn; @@ conn-> +entry_cfg. \( isolation_flags \| session_group \| socks_prefer_no_auth \| ipv4_traffic \| ipv6_traffic \| prefer_ipv6 \| cache_ipv4_answers \| cache_ipv6_answers \| use_cached_ipv4_answers \| use_cached_ipv6_answers \| prefer_ipv6_virtaddr \)
2015-01-16Combine entry_port_cfg_t fields in listener_connection_tNick Mathewson
Also, revise the code using these options with this cocci script: @@ listener_connection_t *conn; @@ conn-> +entry_cfg. \( isolation_flags \| session_group \| socks_prefer_no_auth \| ipv4_traffic \| ipv6_traffic \| prefer_ipv6 \| cache_ipv4_answers \| cache_ipv6_answers \| use_cached_ipv4_answers \| use_cached_ipv6_answers \| prefer_ipv6_virtaddr \)