aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2015-01-12Tweak zero_length_keys.sh and test/include.am to make out-of-tree builds workNick Mathewson
2015-01-12Merge remote-tracking branch 'teor/bug13111-empty-key-files-fn-empty'Nick Mathewson
2015-01-12reindent cell_queues_check_size()Nick Mathewson
2015-01-12Merge branch 'bug13806_squashed'Nick Mathewson
Conflicts: src/or/relay.c
2015-01-12When OOM, free cached hidden service descriptors too.Nick Mathewson
2015-01-12src/common/compat_libevent.h: include testsupport.hAnthony G. Basile
When tor is configured with --enable-bufferevents, the build fails because compat_libevent.h makes use of the macro MOCK_DECL() which is defined in testsupport.h, but not included. We add the include.
2015-01-12Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2015-01-12Merge remote-tracking branch 'public/bug14129_024' into maint-0.2.5Nick Mathewson
2015-01-11Fix unused-parameter warning in systemd_watchdog_callbackNick Mathewson
2015-01-11fix and enable systemd watchdogTomasz Torcz
There were following problems: - configure.ac wrongly checked for defined HAVE_SYSTEMD; this wasn't working, so the watchdog code was not compiled in. Replace library search with explicit version check - sd_notify() watchdog call was unsetting NOTIFY_SOCKET from env; this means only first "watchdog ping" was delivered, each subsequent one did not have socket to be sent to and systemd was killing service - after those fixes, enable Watchdog in systemd unit with one minute intervals
2015-01-11send more details about daemon status to supervisorTomasz Torcz
If running under systemd, send back information when reloading configuration and gracefully shutting down. This gives administator more information about current Tor daemon state.
2015-01-11send PID of the main daemon to supervisorTomasz Torcz
If running under systemd, notify the supervisor about current PID of Tor daemon. This makes systemd unit simpler and more robust: it will do the right thing regardless of RunAsDaemon settings.
2015-01-11Merge remote-tracking branch 'teor/nickm-bug13401'Nick Mathewson
2015-01-11Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2015-01-11Don't crash on torrc Vi[rtualAddrNetworkIPv[4|6]] with no option valueteor
Check for a missing option value in parse_virtual_addr_network before asserting on the NULL in tor_addr_parse_mask_ports. This avoids crashing on torrc lines like Vi[rtualAddrNetworkIPv[4|6]] when no value follows the option. Bugfix on 0.2.3 (de4cc126cbb5 on 24 November 2012), fixes #14142.
2015-01-10Fix tortls.c build with GCC<4.6Nick Mathewson
apparantly, "pragma GCC diagnostic push/pop" don't exist with older versions. Fixes bug in 740e592790f570c446cbb5e6d4a77f842f75; bug not in any released Tor.
2015-01-10Ignore warning for redundant decl in openssl/srtp.hNick Mathewson
2015-01-10Merge remote-tracking branch 'teor/fix-typos'Nick Mathewson
2015-01-10Speed up hidden service bootstrap by reducing the initial post delayteor
Drop the MIN_REND_INITIAL_POST_DELAY on a testing network to 5 seconds, but keep the default at 30 seconds. Reduces the hidden service bootstrap to 25 seconds from around 45 seconds. Change the default src/test/test-network.sh delay to 25 seconds. Closes ticket 13401.
2015-01-10Create TestingDirAuthVoteHSDir like TestingDirAuthVoteExit/Guardteor
TestingDirAuthVoteHSDir ensures that authorities vote the HSDir flag for the listed relays regardless of uptime or ORPort connectivity. Respects the value of VoteOnHidServDirectoriesV2. Partial fix for bug 14067.
2015-01-10Smaller RendPostPeriod on test networksNick Mathewson
This patch makes the minimum 5 seconds, and the default 2 minutes. Closes 13401.
2015-01-10Merge branch 'master' of https://git.torproject.org/tor into ↵teor
bug13111-empty-key-files-fn-empty Conflicts: src/or/connection_edge.c Merged in favour of origin.
2015-01-10Test that tor correctly handles zero-length keysteor
Check that tor generates new keys, and overwrites the empty key files. Test that tor generates new keys when keys are missing (existing behaviour). Test that tor does not overwrite key files that already contain data (existing behaviour). Tests fixes to bug 13111.
2015-01-10Merge branch 'bug14001-clang-warning' into bug13111-empty-key-files-fn-emptyteor
Conflicts: src/or/router.c Choose newer comment. Merge changes to comment and function invocation.
2015-01-10Fix a minor misspelling in util.cteor
2015-01-09Allow two ISO times to appear in EntryGuardDownSince.Nick Mathewson
When I made time parsing more strict, I broke the EntryGuardDownSince line, which relied on two concatenated ISO times being parsed as a single time. Fixes bug 14136. Bugfix on 7984fc153112baa5. Bug not in any released version of Tor.
2015-01-08Avoid attempts to double-remove edge connections from the DNS resolver.Nick Mathewson
Also, avoid crashing when we attempt to double-remove an edge connection from the DNS resolver: just log a bug warning instead. Fixes bug 14129. Bugfix on 0d20fee2fbd48978, which was in 0.0.7rc1. jowr found the bug. cypherpunks wrote the fix. I added the log message and removed the assert.
2015-01-08fix new mingw64 compilation warningsNick Mathewson
2015-01-07Unconfuse coverity when it sees the systemd headersNick Mathewson
2015-01-07GETINFO bw-event-cache to get information on recent BW eventsNick Mathewson
Closes 14128; useful to regain functionality lost because of 13988.
2015-01-07Merge remote-tracking branch 'public/bug12985_025'Nick Mathewson
2015-01-07Merge remote-tracking branch 'public/bug13988_025'Nick Mathewson
2015-01-07appease "make check-spaces"Nick Mathewson
2015-01-07Merge branch 'bug9286_v3_squashed'Nick Mathewson
2015-01-07Stop accepting milliseconds in various directory contextsNick Mathewson
Have clients and authorities both have new behavior, since the fix for bug 11243 has gone in. But make clients still accept accept old bogus HSDir descriptors, to avoid fingerprinting trickery. Fixes bug 9286.
2015-01-07Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2015-01-07Enlarge the buffer for a line in a bw fileSebastian Hahn
2015-01-06Spelling -- readyness->readiness.Nick Mathewson
2015-01-06Fix obsolete usage of test_{str_},eq macrosNick Mathewson
2015-01-06Merge remote-tracking branch 'public/bug13661_025'Nick Mathewson
2015-01-06Merge branch 'exitnode_10067_squashed'Nick Mathewson
Conflicts: src/or/or.h
2015-01-06Add an ExitRelay option to override ExitPolicyNick Mathewson
If we're not a relay, we ignore it. If it's set to 1, we obey ExitPolicy. If it's set to 0, we force ExitPolicy to 'reject *:*' And if it's set to auto, then we warn the user if they're running an exit, and tell them how they can stop running an exit if they didn't mean to do that. Fixes ticket 10067
2015-01-06Merge remote-tracking branch 'public/bug14116_025'Nick Mathewson
2015-01-06Merge remote-tracking branch 'public/bug12509_025'Nick Mathewson
2015-01-06Merge remote-tracking branch 'public/feature11791'Nick Mathewson
2015-01-06Merge remote-tracking branch 'tvdw/from-the-archive'Nick Mathewson
2015-01-06Whitespace fixTom van der Woerdt
2015-01-06Minor IPv6-related memory leak fixesTom van der Woerdt
2015-01-06Minor documentation fixesTom van der Woerdt
2015-01-06Make test_cmdline_args.py work on WindowsNick Mathewson
Patch from Gisle Vanem on tor-dev ml