]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
10 years agoSupport monotonic time for pthread_cond_timedwait
David Goulet [Wed, 21 Jan 2015 18:18:56 +0000 (13:18 -0500)] 
Support monotonic time for pthread_cond_timedwait

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>
10 years agoFix up some workqueue/threading issues spotted by dgoulet.
Nick Mathewson [Wed, 21 Jan 2015 17:22:41 +0000 (12:22 -0500)] 
Fix up some workqueue/threading issues spotted by dgoulet.

10 years agohandle EINTR in compat_*threads.c
Nick Mathewson [Wed, 21 Jan 2015 17:18:11 +0000 (12:18 -0500)] 
handle EINTR in compat_*threads.c

10 years agoUpdate workqueue implementation to use a single queue for the work
Nick Mathewson [Wed, 14 Jan 2015 18:29:58 +0000 (13:29 -0500)] 
Update workqueue implementation to use a single queue for the work

Previously I used one queue per worker; now I use one queue for
everyone.  The "broadcast" code is gone, replaced with an idempotent
'update' operation.

10 years agoIncorporate some comments based on notes from dgoulet
Nick Mathewson [Mon, 16 Dec 2013 15:20:40 +0000 (10:20 -0500)] 
Incorporate some comments based on notes from dgoulet

10 years agoAvoid chan/circ linear lookups for requests
Nick Mathewson [Wed, 2 Oct 2013 19:11:34 +0000 (15:11 -0400)] 
Avoid chan/circ linear lookups for requests

The solution I took is to not free a circuit with a pending
uncancellable work item, but rather to set its magic number to a
sentinel value.  When we get a work item, we check whether the circuit
has that magic sentinel, and if so, we free it rather than processing
the reply.

10 years agoRemove if (1) indentation in cpuworker.c
Nick Mathewson [Wed, 2 Oct 2013 16:34:08 +0000 (12:34 -0400)] 
Remove if (1) indentation in cpuworker.c

To avoid having diffs turn out too big, I had replaced some unneeded
ifs and fors with if (1), so that the indentation would still work out
right.  Now I might as well clean those up.

10 years agoRefactor cpuworker to use workqueue/threadpool code.
Nick Mathewson [Wed, 2 Oct 2013 16:32:09 +0000 (12:32 -0400)] 
Refactor cpuworker to use workqueue/threadpool code.

10 years agoFix check-spaces
Nick Mathewson [Sat, 28 Sep 2013 04:52:28 +0000 (00:52 -0400)] 
Fix check-spaces

10 years agoTest and fix workqueue_entry_cancel().
Nick Mathewson [Sat, 28 Sep 2013 04:33:10 +0000 (00:33 -0400)] 
Test and fix workqueue_entry_cancel().

10 years agoAdd shutdown and broadcast support to test_workqueue.
Nick Mathewson [Sat, 28 Sep 2013 04:09:20 +0000 (00:09 -0400)] 
Add shutdown and broadcast support to test_workqueue.

10 years agoAdd unit test for thread IDs.
Nick Mathewson [Sat, 28 Sep 2013 03:20:22 +0000 (23:20 -0400)] 
Add unit test for thread IDs.

10 years agoBasic unit test for condition variables.
Nick Mathewson [Sat, 28 Sep 2013 03:15:53 +0000 (23:15 -0400)] 
Basic unit test for condition variables.

10 years ago"Recursive" locks, not "reentrant" locks. Duh.
Nick Mathewson [Fri, 27 Sep 2013 16:32:19 +0000 (12:32 -0400)] 
"Recursive" locks, not "reentrant" locks. Duh.

10 years agoUse correct (absolute) time for pthread_cond_timedwait
Nick Mathewson [Fri, 27 Sep 2013 16:09:57 +0000 (12:09 -0400)] 
Use correct (absolute) time for pthread_cond_timedwait

10 years agoFix windows compilation of condition code
Nick Mathewson [Thu, 26 Sep 2013 03:31:40 +0000 (23:31 -0400)] 
Fix windows compilation of condition code

10 years agoFix linux compilation (pipe2 needs _GNU_SOURCE)
Nick Mathewson [Thu, 26 Sep 2013 03:25:02 +0000 (23:25 -0400)] 
Fix linux compilation (pipe2 needs _GNU_SOURCE)

10 years agoMove thread tests into their own module
Nick Mathewson [Wed, 25 Sep 2013 18:50:01 +0000 (14:50 -0400)] 
Move thread tests into their own module

10 years agoTest a little more of compat_threads.c
Nick Mathewson [Wed, 25 Sep 2013 18:31:59 +0000 (14:31 -0400)] 
Test a little more of compat_threads.c

10 years agoRename mutex_for_cond -> mutex_nonreentrant
Nick Mathewson [Wed, 25 Sep 2013 15:41:40 +0000 (11:41 -0400)] 
Rename mutex_for_cond -> mutex_nonreentrant

We'll want to use these for other stuff too.

10 years agoRename bench_workqueue -> test_workqueue and make it a unit test.
Nick Mathewson [Wed, 25 Sep 2013 15:36:02 +0000 (11:36 -0400)] 
Rename bench_workqueue -> test_workqueue and make it a unit test.

10 years agoDocumentation for new workqueue and condition and locking stuff
Nick Mathewson [Wed, 25 Sep 2013 15:05:27 +0000 (11:05 -0400)] 
Documentation for new workqueue and condition and locking stuff

10 years agoAdd a way to tell all threads to do something.
Nick Mathewson [Wed, 25 Sep 2013 00:55:09 +0000 (20:55 -0400)] 
Add a way to tell all threads to do something.

10 years agoIsolate the "socketpair or a pipe" logic for alerting main thread
Nick Mathewson [Wed, 25 Sep 2013 00:43:48 +0000 (20:43 -0400)] 
Isolate the "socketpair or a pipe" logic for alerting main thread

This way we can use the linux eventfd extension where available.
Using EVFILT_USER on the BSDs will be a teeny bit trickier, and will
require libevent hacking.

10 years agoMake pending work cancellable.
Nick Mathewson [Tue, 24 Sep 2013 20:57:40 +0000 (16:57 -0400)] 
Make pending work cancellable.

10 years agoInitial workqueue implemention, with a simple test.
Nick Mathewson [Mon, 23 Sep 2013 05:19:16 +0000 (01:19 -0400)] 
Initial workqueue implemention, with a simple test.

It seems to be working, but more tuning is needed.

10 years agoSpecialize handling for mutexes allocated for condition variables
Nick Mathewson [Tue, 24 Sep 2013 19:03:51 +0000 (15:03 -0400)] 
Specialize handling for mutexes allocated for condition variables

(These must not be reentrant mutexes with pthreads.)

10 years agoAdd tor_cond_init/uninit
Nick Mathewson [Mon, 23 Sep 2013 05:15:30 +0000 (01:15 -0400)] 
Add tor_cond_init/uninit

10 years agoAdd a timeout to tor_cond_wait; add tor_cond impl from libevent
Nick Mathewson [Mon, 23 Sep 2013 02:08:41 +0000 (22:08 -0400)] 
Add a timeout to tor_cond_wait; add tor_cond impl from libevent

The windows code may need some tweaks for it to compile; I've not
tested it yet.

10 years agoSplit threading-related code out of compat.c
Nick Mathewson [Mon, 23 Sep 2013 01:30:46 +0000 (21:30 -0400)] 
Split threading-related code out of compat.c

Also, re-enable the #if'd out condition-variable code.

Work queues are going to make us hack on all of this stuff a bit more
closely, so it might not be a terrible idea to make it easier to hack.

10 years agoDo not log a notice on every socks connection
Nick Mathewson [Wed, 14 Jan 2015 14:54:40 +0000 (09:54 -0500)] 
Do not log a notice on every socks connection

10 years agoNew minimum uptime to become an HSDir is 96 hours.
George Kadianakis [Wed, 14 Jan 2015 12:47:54 +0000 (12:47 +0000)] 
New minimum uptime to become an HSDir is 96 hours.

10 years agoFix new unused variable warning in connection_listener_new
Nick Mathewson [Tue, 13 Jan 2015 18:45:35 +0000 (13:45 -0500)] 
Fix new unused variable warning in connection_listener_new

10 years agoupdate bug12585 changes file
Nick Mathewson [Tue, 13 Jan 2015 18:13:19 +0000 (13:13 -0500)] 
update bug12585 changes file

10 years agowhitespace fix
Nick Mathewson [Tue, 13 Jan 2015 18:11:39 +0000 (13:11 -0500)] 
whitespace fix

10 years agoMerge remote-tracking branch 'andrea/ticket12585_v3'
Nick Mathewson [Tue, 13 Jan 2015 17:50:55 +0000 (12:50 -0500)] 
Merge remote-tracking branch 'andrea/ticket12585_v3'

10 years agoFix a conversion warning on 32-bit clang
Nick Mathewson [Tue, 13 Jan 2015 03:33:10 +0000 (22:33 -0500)] 
Fix a conversion warning on 32-bit clang

10 years agoOn jessie, we need a =, not a ==
Nick Mathewson [Tue, 13 Jan 2015 03:30:40 +0000 (22:30 -0500)] 
On jessie, we need a =, not a ==

10 years agomktemp wants some Xs
Nick Mathewson [Tue, 13 Jan 2015 02:45:41 +0000 (21:45 -0500)] 
mktemp wants some Xs

10 years agoTweak zero_length_keys.sh and test/include.am to make out-of-tree builds work
Nick Mathewson [Tue, 13 Jan 2015 02:28:01 +0000 (21:28 -0500)] 
Tweak zero_length_keys.sh and test/include.am to make out-of-tree builds work

10 years agoExplicitly chmod AF_UNIX sockets to 0600 when *GroupWritable isn't specified
Andrea Shepard [Tue, 13 Jan 2015 00:27:04 +0000 (00:27 +0000)] 
Explicitly chmod AF_UNIX sockets to 0600 when *GroupWritable isn't specified

10 years agoRemove no-longer-accurate comment from connection.c
Andrea Shepard [Tue, 13 Jan 2015 00:21:59 +0000 (00:21 +0000)] 
Remove no-longer-accurate comment from connection.c

10 years agoFix ipv4/ipv6 traffic bits on AF_UNIX socks listeners and remove hacky workarounds...
Andrea Shepard [Tue, 13 Jan 2015 00:18:17 +0000 (00:18 +0000)] 
Fix ipv4/ipv6 traffic bits on AF_UNIX socks listeners and remove hacky workarounds for brokenness

10 years agoFix default list handling for parse_unix_socket_config(); avoid clearing whole pre...
Andrea Shepard [Mon, 12 Jan 2015 22:12:18 +0000 (22:12 +0000)] 
Fix default list handling for parse_unix_socket_config(); avoid clearing whole pre-existing list

10 years agoMerge remote-tracking branch 'teor/bug13111-empty-key-files-fn-empty'
Nick Mathewson [Mon, 12 Jan 2015 19:06:14 +0000 (14:06 -0500)] 
Merge remote-tracking branch 'teor/bug13111-empty-key-files-fn-empty'

10 years agoreindent cell_queues_check_size()
Nick Mathewson [Mon, 12 Jan 2015 18:59:50 +0000 (13:59 -0500)] 
reindent cell_queues_check_size()

10 years agoMerge branch 'bug13806_squashed'
Nick Mathewson [Mon, 12 Jan 2015 18:59:26 +0000 (13:59 -0500)] 
Merge branch 'bug13806_squashed'

Conflicts:
src/or/relay.c

10 years agoWhen OOM, free cached hidden service descriptors too.
Nick Mathewson [Mon, 5 Jan 2015 01:05:29 +0000 (20:05 -0500)] 
When OOM, free cached hidden service descriptors too.

10 years agoKill duplicated code in connection_listener_new()
Andrea Shepard [Mon, 12 Jan 2015 16:26:34 +0000 (16:26 +0000)] 
Kill duplicated code in connection_listener_new()

10 years agoIf libsystemd-daemon.pc is not found, look for libsystemd
Nick Mathewson [Mon, 12 Jan 2015 14:49:52 +0000 (09:49 -0500)] 
If libsystemd-daemon.pc is not found, look for libsystemd

(Thanks to toralf for noting that the build was broken, and to
Sebastian for telling me that my fix still wasn't right.)

10 years agosrc/common/compat_libevent.h: include testsupport.h
Anthony G. Basile [Thu, 8 Jan 2015 17:11:28 +0000 (12:11 -0500)] 
src/common/compat_libevent.h: include testsupport.h

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.

10 years agoMerge remote-tracking branch 'origin/maint-0.2.5'
Nick Mathewson [Mon, 12 Jan 2015 05:59:48 +0000 (00:59 -0500)] 
Merge remote-tracking branch 'origin/maint-0.2.5'

10 years agoMerge remote-tracking branch 'public/bug14129_024' into maint-0.2.5
Nick Mathewson [Mon, 12 Jan 2015 05:59:29 +0000 (00:59 -0500)] 
Merge remote-tracking branch 'public/bug14129_024' into maint-0.2.5

10 years agoActually remove LOCALSTATEDIR@/run/tor line from tor.service.in
Nick Mathewson [Mon, 12 Jan 2015 01:49:19 +0000 (20:49 -0500)] 
Actually remove LOCALSTATEDIR@/run/tor line from tor.service.in

10 years agoFix build on systemdless systems
Nick Mathewson [Mon, 12 Jan 2015 01:47:15 +0000 (20:47 -0500)] 
Fix build on systemdless systems

Fixes bug 14170.

10 years agochanges file for bug13805
Nick Mathewson [Sun, 11 Jan 2015 16:27:33 +0000 (11:27 -0500)] 
changes file for bug13805

10 years agosystemd changes for 13805 as recommened by Tomasz on that ticket.
Nick Mathewson [Sun, 11 Jan 2015 16:26:08 +0000 (11:26 -0500)] 
systemd changes for 13805 as recommened by Tomasz on that ticket.

10 years agoMerge remote-tracking branch 'candrews/issue13805'
Nick Mathewson [Sun, 11 Jan 2015 16:24:48 +0000 (11:24 -0500)] 
Merge remote-tracking branch 'candrews/issue13805'

10 years agoFix unused-parameter warning in systemd_watchdog_callback
Nick Mathewson [Sun, 11 Jan 2015 16:19:51 +0000 (11:19 -0500)] 
Fix unused-parameter warning in systemd_watchdog_callback

10 years agochanges file for 14141
Nick Mathewson [Sun, 11 Jan 2015 16:19:12 +0000 (11:19 -0500)] 
changes file for 14141

10 years agofix and enable systemd watchdog
Tomasz Torcz [Fri, 9 Jan 2015 22:42:16 +0000 (23:42 +0100)] 
fix and enable systemd watchdog

  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

10 years agosend more details about daemon status to supervisor
Tomasz Torcz [Fri, 9 Jan 2015 21:44:00 +0000 (22:44 +0100)] 
send more details about daemon status to supervisor

  If running under systemd, send back information when reloading
configuration and gracefully shutting down.  This gives administator
more information about current Tor daemon state.

10 years agosend PID of the main daemon to supervisor
Tomasz Torcz [Fri, 9 Jan 2015 21:17:50 +0000 (22:17 +0100)] 
send PID of the main daemon to supervisor

  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.

10 years agoMerge remote-tracking branch 'teor/nickm-bug13401'
Nick Mathewson [Sun, 11 Jan 2015 16:10:23 +0000 (11:10 -0500)] 
Merge remote-tracking branch 'teor/nickm-bug13401'

10 years agoMerge remote-tracking branch 'origin/maint-0.2.5'
Nick Mathewson [Sun, 11 Jan 2015 16:05:31 +0000 (11:05 -0500)] 
Merge remote-tracking branch 'origin/maint-0.2.5'

10 years agoDon't crash on torrc Vi[rtualAddrNetworkIPv[4|6]] with no option value
teor [Sun, 11 Jan 2015 08:33:04 +0000 (19:33 +1100)] 
Don't crash on torrc Vi[rtualAddrNetworkIPv[4|6]] with no option value

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.

10 years agoFix tortls.c build with GCC<4.6
Nick Mathewson [Sat, 10 Jan 2015 22:25:16 +0000 (17:25 -0500)] 
Fix tortls.c build with GCC<4.6

apparantly, "pragma GCC diagnostic push/pop" don't exist with older versions.

Fixes bug in 740e592790f570c446cbb5e6d4a77f842f75; bug not in any
released Tor.

10 years agoBetter workaround for CFLAGS issues from #14072; fixes #14162
Nick Mathewson [Sat, 10 Jan 2015 22:21:11 +0000 (17:21 -0500)] 
Better workaround for CFLAGS issues from #14072; fixes #14162

When I applied patch fcc78e5f8a3249eadfea31db, I somehow broke
stack trace symbols on Linux.  I'll leave it to others to figure out
why that happens.  This should be better.  Really.

Fixes bug 14162; bug not in any released version of Tor.

10 years agoIgnore warning for redundant decl in openssl/srtp.h
Nick Mathewson [Sat, 10 Jan 2015 21:06:25 +0000 (16:06 -0500)] 
Ignore warning for redundant decl in openssl/srtp.h

10 years agoMerge remote-tracking branch 'teor/fix-typos'
Nick Mathewson [Sat, 10 Jan 2015 21:00:12 +0000 (16:00 -0500)] 
Merge remote-tracking branch 'teor/fix-typos'

10 years agoSpeed up hidden service bootstrap by reducing the initial post delay
teor [Sat, 10 Jan 2015 11:20:29 +0000 (22:20 +1100)] 
Speed up hidden service bootstrap by reducing the initial post delay

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.

10 years agoCreate TestingDirAuthVoteHSDir like TestingDirAuthVoteExit/Guard
teor [Sat, 10 Jan 2015 10:43:31 +0000 (21:43 +1100)] 
Create TestingDirAuthVoteHSDir like TestingDirAuthVoteExit/Guard

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.

10 years agoSmaller RendPostPeriod on test networks
Nick Mathewson [Mon, 5 Jan 2015 01:10:53 +0000 (20:10 -0500)] 
Smaller RendPostPeriod on test networks

This patch makes the minimum 5 seconds, and the default 2 minutes.

Closes 13401.

10 years agoMerge branch 'master' of https://git.torproject.org/tor into bug13111-empty-key-files...
teor [Sat, 10 Jan 2015 06:20:06 +0000 (17:20 +1100)] 
Merge branch 'master' of https://git.torproject.org/tor into bug13111-empty-key-files-fn-empty

Conflicts:
  src/or/connection_edge.c
Merged in favour of origin.

10 years agoTest that tor correctly handles zero-length keys
teor [Sat, 10 Jan 2015 06:14:29 +0000 (17:14 +1100)] 
Test that tor correctly handles zero-length keys

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.

10 years agoMerge branch 'bug14001-clang-warning' into bug13111-empty-key-files-fn-empty
teor [Sat, 10 Jan 2015 05:34:10 +0000 (16:34 +1100)] 
Merge branch 'bug14001-clang-warning' into bug13111-empty-key-files-fn-empty

Conflicts:
  src/or/router.c
Choose newer comment.
Merge changes to comment and function invocation.

10 years agoFix a minor misspelling in util.c
teor [Sat, 10 Jan 2015 04:52:55 +0000 (15:52 +1100)] 
Fix a minor misspelling in util.c

10 years agoDocument disable option for ControlSocket and SocksSocket
Andrea Shepard [Fri, 9 Jan 2015 20:54:59 +0000 (20:54 +0000)] 
Document disable option for ControlSocket and SocksSocket

10 years agoAdd support for a default list of paths and passing '0' to disable it to parse_unix_s...
Andrea Shepard [Fri, 9 Jan 2015 20:49:54 +0000 (20:49 +0000)] 
Add support for a default list of paths and passing '0' to disable it to parse_unix_socket_config()

10 years agoAllow two ISO times to appear in EntryGuardDownSince.
Nick Mathewson [Fri, 9 Jan 2015 13:50:56 +0000 (08:50 -0500)] 
Allow two ISO times to appear in EntryGuardDownSince.

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.

10 years agoAvoid attempts to double-remove edge connections from the DNS resolver.
Nick Mathewson [Thu, 8 Jan 2015 16:00:21 +0000 (11:00 -0500)] 
Avoid attempts to double-remove edge connections from the DNS resolver.

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.

10 years agofix new mingw64 compilation warnings
Nick Mathewson [Thu, 8 Jan 2015 15:44:30 +0000 (10:44 -0500)] 
fix new mingw64 compilation warnings

10 years agoUnconfuse coverity when it sees the systemd headers
Nick Mathewson [Thu, 8 Jan 2015 02:09:41 +0000 (21:09 -0500)] 
Unconfuse coverity when it sees the systemd headers

10 years agoDowngrade open/close log message for SocksSocket
Andrea Shepard [Wed, 7 Jan 2015 22:57:51 +0000 (22:57 +0000)] 
Downgrade open/close log message for SocksSocket

10 years agoBring sanity to connection_listener_new()
Andrea Shepard [Wed, 7 Jan 2015 22:51:24 +0000 (22:51 +0000)] 
Bring sanity to connection_listener_new()

10 years agoRename is_tcp in connection_listener_new(), since AF_UNIX means SOCK_STREAM no longer...
Andrea Shepard [Wed, 7 Jan 2015 19:45:59 +0000 (19:45 +0000)] 
Rename is_tcp in connection_listener_new(), since AF_UNIX means SOCK_STREAM no longer implies TCP

10 years agoRefactor check_location_for_unix_socket()/check_location_for_socks_unix_socket()...
Andrea Shepard [Wed, 7 Jan 2015 19:17:04 +0000 (19:17 +0000)] 
Refactor check_location_for_unix_socket()/check_location_for_socks_unix_socket() to eliminate duplicated code

10 years agoMerge branch 'ticket14128_squashed'
Nick Mathewson [Wed, 7 Jan 2015 18:19:57 +0000 (13:19 -0500)] 
Merge branch 'ticket14128_squashed'

10 years agoGETINFO bw-event-cache to get information on recent BW events
Nick Mathewson [Wed, 7 Jan 2015 16:37:23 +0000 (11:37 -0500)] 
GETINFO bw-event-cache to get information on recent BW events

Closes 14128; useful to regain functionality lost because of 13988.

10 years agoCommit second draft of Jake's SOCKS5-over-AF_UNIX patch. See ticket #12585.
Jacob Appelbaum [Mon, 11 Aug 2014 19:27:04 +0000 (12:27 -0700)] 
Commit second draft of Jake's SOCKS5-over-AF_UNIX patch.  See ticket #12585.

Signed-off-by: Andrea Shepard <andrea@torproject.org>
10 years agoMerge remote-tracking branch 'public/bug12985_025'
Nick Mathewson [Wed, 7 Jan 2015 16:55:50 +0000 (11:55 -0500)] 
Merge remote-tracking branch 'public/bug12985_025'

10 years agoMerge remote-tracking branch 'public/bug12985_024' into bug12985_025
Nick Mathewson [Wed, 7 Jan 2015 16:54:33 +0000 (11:54 -0500)] 
Merge remote-tracking branch 'public/bug12985_024' into bug12985_025

10 years agoClarify why bug12985 is a thing
Nick Mathewson [Wed, 7 Jan 2015 16:52:24 +0000 (11:52 -0500)] 
Clarify why bug12985 is a thing

10 years agoMerge remote-tracking branch 'public/bug13988_025'
Nick Mathewson [Wed, 7 Jan 2015 16:45:24 +0000 (11:45 -0500)] 
Merge remote-tracking branch 'public/bug13988_025'

10 years agoappease "make check-spaces"
Nick Mathewson [Wed, 7 Jan 2015 15:09:09 +0000 (10:09 -0500)] 
appease "make check-spaces"

10 years agoMerge branch 'bug9286_v3_squashed'
Nick Mathewson [Wed, 7 Jan 2015 15:06:50 +0000 (10:06 -0500)] 
Merge branch 'bug9286_v3_squashed'

10 years agoStop accepting milliseconds in various directory contexts
Nick Mathewson [Fri, 19 Jul 2013 03:45:40 +0000 (23:45 -0400)] 
Stop accepting milliseconds in various directory contexts

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.

10 years agoMerge remote-tracking branch 'origin/maint-0.2.5'
Nick Mathewson [Wed, 7 Jan 2015 12:50:14 +0000 (07:50 -0500)] 
Merge remote-tracking branch 'origin/maint-0.2.5'

10 years agoEnlarge the buffer for a line in a bw file
Sebastian Hahn [Wed, 7 Jan 2015 11:43:21 +0000 (12:43 +0100)] 
Enlarge the buffer for a line in a bw file

10 years agoSpelling -- readyness->readiness.
Nick Mathewson [Tue, 6 Jan 2015 22:10:27 +0000 (17:10 -0500)] 
Spelling -- readyness->readiness.