teor
c200ab46b8
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.
2015-01-10 16:34:10 +11:00
teor
5ac26cb7c7
Fix a minor misspelling in util.c
2015-01-10 15:52:55 +11:00
Andrea Shepard
78956f5d85
Document disable option for ControlSocket and SocksSocket
2015-01-09 20:54:59 +00:00
Andrea Shepard
0729b2be53
Add support for a default list of paths and passing '0' to disable it to parse_unix_socket_config()
2015-01-09 20:49:54 +00:00
Nick Mathewson
33df3e37ff
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 7984fc1531
. Bug not in any released
version of Tor.
2015-01-09 08:50:56 -05:00
Nick Mathewson
905287415b
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 0d20fee2fb
, 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-08 11:00:21 -05:00
Nick Mathewson
6f171003ce
fix new mingw64 compilation warnings
2015-01-08 10:44:30 -05:00
Nick Mathewson
71f409606a
Unconfuse coverity when it sees the systemd headers
2015-01-07 21:09:41 -05:00
Andrea Shepard
a3bcde3638
Downgrade open/close log message for SocksSocket
2015-01-07 22:57:51 +00:00
Andrea Shepard
2ca1c386b0
Bring sanity to connection_listener_new()
2015-01-07 22:51:24 +00:00
Andrea Shepard
48633c0766
Rename is_tcp in connection_listener_new(), since AF_UNIX means SOCK_STREAM no longer implies TCP
2015-01-07 19:45:59 +00:00
Andrea Shepard
c6451e4c9f
Refactor check_location_for_unix_socket()/check_location_for_socks_unix_socket() to eliminate duplicated code
2015-01-07 19:17:04 +00:00
Nick Mathewson
ceed53c39b
Merge branch 'ticket14128_squashed'
2015-01-07 13:19:57 -05:00
Nick Mathewson
f8baa40c01
GETINFO bw-event-cache to get information on recent BW events
...
Closes 14128; useful to regain functionality lost because of 13988.
2015-01-07 13:19:43 -05:00
Jacob Appelbaum
8d59ddf3cb
Commit second draft of Jake's SOCKS5-over-AF_UNIX patch. See ticket #12585 .
...
Signed-off-by: Andrea Shepard <andrea@torproject.org>
2015-01-07 17:42:57 +00:00
Nick Mathewson
1abd526c75
Merge remote-tracking branch 'public/bug12985_025'
2015-01-07 11:55:50 -05:00
Nick Mathewson
139a1c64a0
Merge remote-tracking branch 'public/bug12985_024' into bug12985_025
2015-01-07 11:54:33 -05:00
Nick Mathewson
e9463b04e7
Clarify why bug12985 is a thing
2015-01-07 11:52:24 -05:00
Nick Mathewson
7dd852835c
Merge remote-tracking branch 'public/bug13988_025'
2015-01-07 11:45:24 -05:00
Nick Mathewson
79aaad952f
appease "make check-spaces"
2015-01-07 10:09:09 -05:00
Nick Mathewson
cb54cd6745
Merge branch 'bug9286_v3_squashed'
2015-01-07 10:06:50 -05:00
Nick Mathewson
7984fc1531
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.
2015-01-07 10:05:55 -05:00
Nick Mathewson
49dca8b1be
Merge remote-tracking branch 'origin/maint-0.2.5'
2015-01-07 07:50:14 -05:00
Sebastian Hahn
2b9d48791d
Enlarge the buffer for a line in a bw file
2015-01-07 12:44:16 +01:00
Nick Mathewson
7c5a45575f
Spelling -- readyness->readiness.
2015-01-06 17:10:27 -05:00
Nick Mathewson
108808e98e
Fix obsolete usage of test_{str_},eq macros
2015-01-06 15:25:20 -05:00
Nick Mathewson
ae9efa863e
Merge remote-tracking branch 'public/bug13661_025'
2015-01-06 15:16:28 -05:00
Nick Mathewson
90b9e23bec
Merge branch 'exitnode_10067_squashed'
...
Conflicts:
src/or/or.h
2015-01-06 15:15:18 -05:00
Nick Mathewson
d87143f319
changes file for 10067
2015-01-06 14:31:20 -05:00
Nick Mathewson
35efce1f3f
Add an ExitRelay option to override ExitPolicy
...
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-06 14:31:20 -05:00
Nick Mathewson
3401c34151
Merge remote-tracking branch 'public/bug14116_025'
2015-01-06 14:28:02 -05:00
Nick Mathewson
a034863b45
Merge remote-tracking branch 'public/bug12509_025'
2015-01-06 14:15:08 -05:00
Nick Mathewson
fcc78e5f8a
Use package-config output for -lsystemd correctly
...
In systemd 209, they deprecated -lsystemd-daemon in favor of
-lsystemd. So we'd better actually look at the pkg-config output,
or we'll get warnings on newer distributions.
For some as-yet-unknown-to-me reason, setting CFLAGS so early makes
it so -O2 -g doesn't get added to it later. So, adding it myself
later. Perhaps a better fix here can be found.
Fixes 14072; bugfix on 0.2.6.2-alpha. Based on a patch from h.venev
2015-01-06 14:07:13 -05:00
Nick Mathewson
cf2ac8e255
Merge remote-tracking branch 'public/feature11791'
2015-01-06 13:52:54 -05:00
Nick Mathewson
6f7a8f84d9
changes file for 4385211caf
2015-01-06 13:45:57 -05:00
Nick Mathewson
082bfd3b55
Merge remote-tracking branch 'tvdw/from-the-archive'
2015-01-06 13:44:13 -05:00
Tom van der Woerdt
5d322e6ef6
Whitespace fix
2015-01-06 19:41:29 +01:00
Tom van der Woerdt
4385211caf
Minor IPv6-related memory leak fixes
2015-01-06 19:40:23 +01:00
Tom van der Woerdt
f5f80790d2
Minor documentation fixes
2015-01-06 19:39:52 +01:00
Nick Mathewson
f4221a809a
Make test_cmdline_args.py work on Windows
...
Patch from Gisle Vanem on tor-dev ml
2015-01-06 13:26:52 -05:00
Nick Mathewson
839076ab00
have 'make {clean,reset_gcov}' remove gcov files in subdirectories
2015-01-06 09:03:44 -05:00
Nick Mathewson
d74f0cff92
make "make test-stem" run stem tests on tor
...
Closes ticket 14107.
2015-01-06 09:03:44 -05:00
Nick Mathewson
6d6643298d
Don't crash on malformed EXTENDCIRCUIT.
...
Fixes 14116; bugfix on ac68704f
in 0.2.2.9-alpha.
2015-01-06 08:49:57 -05:00
Nick Mathewson
276700131a
Tolerate starting up with missing hidden service directory
...
Fixes bug 14106; bugfix on 0.2.6.2-alpha
Found by stem tests.
2015-01-05 11:39:38 -05:00
Nick Mathewson
8ef6cdc39f
Prevent changes to other options from removing . from AutomapHostsSuffixes
...
This happened because we changed AutomapHostsSuffixes to replace "."
with "", since a suffix of "" means "match everything." But our
option handling code for CSV options likes to remove empty entries
when it re-parses stuff.
Instead, let "." remain ".", and treat it specially when we're
checking for a match.
Fixes bug 12509; bugfix on 0.2.0.1-alpha.
2015-01-04 17:28:54 -05:00
Nick Mathewson
fc0febc5c6
Commit the update-copyrights script.
...
(I'm tired of rewriting this by hand every January)
2015-01-02 14:28:21 -05:00
Nick Mathewson
f54e54b0b4
Bump copyright dates to 2015, in case someday this matters.
2015-01-02 14:27:39 -05:00
Nick Mathewson
563bb1ad81
Bump version to 0.2.6.2-alpha-dev
2014-12-31 13:24:12 -05:00
Nick Mathewson
6cb1daf062
edit the changelog one last time
2014-12-31 13:09:09 -05:00
Nick Mathewson
ecd5868ae8
tweak changelog usage
2014-12-31 11:24:47 -05:00