summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2014-08-21Make the two branches of tor_tls_used_v1_handshake into one.Nick Mathewson
(Coverity thinks that "if (a) X; else X;" is probably a bug.) [Coverity CID 1232086]
2014-08-20Merge branch 'bug12205_take2_squashed'Nick Mathewson
2014-08-20Whitespace fixesNick Mathewson
2014-08-20Small cleanups to test_entry_is_time_to_retryNick Mathewson
2014-08-20Unit testing entry_is_time_to_retry().rl1987
2014-08-20Write comments for members of periods array.rl1987
2014-08-20Rewriting entry_is_time_to_retry() using table approach.rl1987
2014-08-20Merge branch 'bug10116_squashed'Nick Mathewson
2014-08-20Don't allocate an extra smartlist in the OOM handlerNick Mathewson
Fixes issue 10116
2014-08-20fix remaining compilation problemsNick Mathewson
2014-08-20Fix return value of tor_fd_seekend.Nick Mathewson
Previously, we had documented it to return -1 or 0, when in fact lseek returns -1 or the new position in the file. This is harmless, since we were only checking for negative values when we used tor_fd_seekend.
2014-08-20Allow named pipes for our log files.Nick Mathewson
Closes ticket 12061. Based on a patch from "carlo von lynX" on tor-dev at https://lists.torproject.org/pipermail/tor-dev/2014-April/006705.html
2014-08-20Merge remote-tracking branch 'public/bug11787'Nick Mathewson
2014-08-20Merge remote-tracking branch 'public/bug12908_025'Nick Mathewson
2014-08-20Warn if Tor is a relay and a HSSathyanarayanan Gunasekaran
Closes 12908; see #8742
2014-08-20Merge remote-tracking branch 'public/bug12728_024'Nick Mathewson
2014-08-20Fix entrynodes test fails because of outdated test vectors.George Kadianakis
2014-08-20Merge remote-tracking branch 'public/bug12700_024'Nick Mathewson
2014-08-18Fix relay_command_to_string(); solve 12700.Nick Mathewson
Two bugs here: 1) We didn't add EXTEND2/EXTENDED2 to relay_command_to_string(). 2) relay_command_to_string() didn't log the value of unrecognized commands. Both fixed here.
2014-08-18Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2014-08-18Fix windows warning introduced by 0808ed83f9cf312abe229Nick Mathewson
This will fix the warning "/src/or/config.c:6854:48: error: unused parameter 'group_readable'" that I introduced while fixing 12864. Bug not in any released version of Tor.
2014-08-15Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2014-08-15Merge remote-tracking branch 'asn/nickm-bug12864_025' into maint-0.2.5Nick Mathewson
2014-08-15Hand-fix a few global_circuit_list casesNick Mathewson
2014-08-15Autoconvert most circuit-list iterations to smartlist iterationsNick Mathewson
Breaks compilation. Used this coccinelle script: @@ identifier c; typedef circuit_t; iterator name TOR_LIST_FOREACH; iterator name SMARTLIST_FOREACH_BEGIN; statement S; @@ - circuit_t *c; ... - TOR_LIST_FOREACH(c, \(&global_circuitlist\|circuit_get_global_list()\), head) + SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *, c) S + SMARTLIST_FOREACH_END(c);
2014-08-15Some documentation fixes for #12864.George Kadianakis
2014-08-15Start converting circuitlist to smartlist.Nick Mathewson
2014-08-15Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2014-08-15Remove stale printfs from buffer/zlib_fin_at_chunk_end testNick Mathewson
These got committed by mistake.
2014-08-15Documentation fix for policy_summarize().Nick Mathewson
Spotted by "epilys"
2014-08-15Restore functionality for CookieAuthFileGroupReadable.Nick Mathewson
When we merged the cookieauthfile creation logic in 33c3e60a37, we accidentally took out this feature. Fixes bug 12864, bugfix on 0.2.5.1-alpha. Also adds an ExtORPortCookieAuthFileGroupReadable, since there's no reason not to.
2014-08-13Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2014-08-13Merge remote-tracking branch 'public/bug12848_024' into maint-0.2.5Nick Mathewson
Conflicts: src/or/circuitbuild.c
2014-08-13Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2014-08-13Apply an MSVC compilation fix from Gisle VanemNick Mathewson
This fixes a double-define introduced in 28538069b2f1909a7600ec6d
2014-08-13Merge remote-tracking branch 'public/use_calloc'Nick Mathewson
2014-08-13Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2014-08-13Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2014-08-13Merge remote-tracking branch 'karsten/geoip6-aug2014' into maint-0.2.4Nick Mathewson
2014-08-13Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2014-08-13Fix whitespace issuesNick Mathewson
2014-08-13Apply coccinelle script to replace malloc(a*b)->calloc(a,b)Nick Mathewson
2014-08-13Add reallocarray clone so we can stop doing multiply-then-reallocateNick Mathewson
2014-08-13Update geoip6 to the August 7 2014 database.Karsten Loesing
2014-08-13Update geoip to the August 7 2014 database.Karsten Loesing
2014-08-12Fix another case of 12848 in circuit_handle_first_hopNick Mathewson
I looked for other places where we set circ->n_chan early, and found one in circuit_handle_first_hop() right before it calls circuit_send_next_onion_skin(). If onion_skin_create() fails there, then n_chan will still be set when circuit_send_next_onion_skin() returns. We should probably fix that too.
2014-08-12Add an extra check in channel_send_destroy for circID==0Nick Mathewson
Prevents other cases of 12848.
2014-08-12Don't send DESTROY to circID 0 when circuit_deliver_create_cell failsNick Mathewson
Cypherpunks found this and wrote this patch. Fix for 12848; fix on (I think) d58d4c0d, which went into 0.0.8pre1
2014-08-08Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2014-08-06Build circuits more readily when DisableNetwork goes to 0Roger Dingledine
When Tor starts with DisabledNetwork set, it would correctly conclude that it shouldn't try making circuits, but it would mistakenly cache this conclusion and continue believing it even when DisableNetwork is set to 0. Fixes the bug introduced by the fix for bug 11200; bugfix on 0.2.5.4-alpha.
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion