summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-18Improve comments in checkSpace.pl to explain how to fix its warningsNick Mathewson
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-15Some documentation fixes for #12864.George Kadianakis
2014-08-15Add scripts/coccinelle to scripts/READMENick Mathewson
2014-08-15Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2014-08-15Missing changes file for 3f683aadcd03c311c1Nick Mathewson
Looks like I forgot to commit this.
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-15Documentation fix on arguments to CookieAuthFileGroupReadableNick Mathewson
We don't actually allow a group name, but the documentation implied that we did.
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-13Add changes file for bug12855Nick Mathewson
2014-08-13Apply coccinelle script to replace malloc(a*b)->calloc(a,b)Nick Mathewson
2014-08-13Add a simple coccinelle script to replace malloc->callocNick Mathewson
Coccinelle is a semantic patching tool that can automatically change C code via semantic patching. This script also replaces realloc with reallocarray as appropriate.
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-09Fix some URLs in the READMENick Mathewson
patch from mttp; fixes 12830
2014-08-09fix extra words in man pageRoger Dingledine
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.
2014-08-06fix three typos in commentsRoger Dingledine
2014-08-05Correctly remove extraneous space in router family linesNick Mathewson
Fixes bug 12728; bugfix on 0.2.1.7-alpha when the SPLIT_IGNORE_SPACE option was added.
2014-08-03and oh hey, repeat code :)Roger Dingledine
2014-08-03fix typoRoger Dingledine
2014-07-30Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2014-07-30Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' ↵Nick Mathewson
into maint-0.2.5 Conflicts: contrib/dist/tor.service.in
2014-07-30Merge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into ↵Nick Mathewson
maint-0.2.5
2014-07-30Verify configuration file via ExecStartPre in the systemd unit file (#12730).intrigeri
2014-07-30Explicitly disable RunAsDaemon in the systemd unit file (#12731).intrigeri
Our current systemd unit uses "Type = simple", so systemd does not expect tor to fork. If the user has "RunAsDaemon 1" in their torrc, then things won't work as expected. This is e.g. the case on Debian (and derivatives), since there we pass "--defaults-torrc /usr/share/tor/tor-service-defaults-torrc" (that contains "RunAsDaemon 1") by default. The only solution I could find is to explicitly pass "--RunAsDaemon 0" when starting tor from the systemd unit file, which this commit does.
2014-07-28Cast long long arguments to (int) for tt_int_op()Peter Palfrader
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion