Nick Mathewson
0dde4d6fa2
Merge remote-tracking branch 'yawning/bug14922'
2015-02-25 08:56:34 -05:00
Nick Mathewson
cc6fd9833c
Merge remote-tracking branch 'origin/maint-0.2.5'
2015-02-24 13:25:47 -05:00
Nick Mathewson
51df1f9906
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-02-24 13:25:32 -05:00
Nick Mathewson
51e36026e5
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-02-24 13:24:57 -05:00
Nick Mathewson
2bcb596dcf
Merge remote-tracking branch 'public/bug14129_024' into maint-0.2.4
2015-02-24 13:23:44 -05:00
Nick Mathewson
4a17c541b7
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-02-24 11:54:16 -05:00
Nick Mathewson
fec73c876b
Add sections to changes files; please lintchanges
2015-02-24 11:51:59 -05:00
Nick Mathewson
3e9409ef58
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-02-24 11:36:34 -05:00
Nick Mathewson
783a44f9e9
Log less/better about systemd at startup
...
Report errors if the notification fails; report success only if it
succeeds; and if we are not notifying systemd because we aren't
running with systemd, don't log at notice.
2015-02-24 11:11:24 -05:00
Nick Mathewson
d5aee5e9a5
changes file for ticket 14950
2015-02-24 11:11:17 -05:00
Nick Mathewson
e49d63a7ce
Bump master to 0.2.7
2015-02-24 10:31:05 -05:00
Nick Mathewson
af60e7566e
Update test_status.c to accommodate changes in heartbeat messages
...
Fixes #15012 ; bug not in any released Tor
2015-02-24 10:05:34 -05:00
Nick Mathewson
d74a78c58a
Merge branch 'bug14950_logs_squashed'
2015-02-23 13:04:03 -05:00
Nick Mathewson
d221b507c9
Avoid logging natural-language reports that are redundant with bootstrapping
2015-02-23 13:03:56 -05:00
Nick Mathewson
10ae9b9bf5
Usually downgrade middle heartbeat messages when stuff is in-range
2015-02-23 13:03:56 -05:00
Nick Mathewson
098cbcbb9e
Merge branch 'bug14989'
2015-02-23 13:03:07 -05:00
Nick Mathewson
21ac0cd2af
Let AF_UNIX connections through the sandbox
...
Fixes bug 15003; bugfix on 0.2.6.3-alpha.
2015-02-23 12:35:20 -05:00
Nick Mathewson
f1fa85ea73
Fix running with the seccomp2 sandbox
...
We had a regression in 0.2.6.3-alpha when we stopped saying
IPPROTO_TCP to socket(). Fixes bug 14989, bugfix on 0.2.6.3-alpha.
2015-02-23 12:16:08 -05:00
Nick Mathewson
7a1a0a4cd7
Merge remote-tracking branch 'public/bug14988_025'
2015-02-23 11:33:07 -05:00
Nick Mathewson
aeb38bbdce
add another unused-var marker in backtrace.c for 14988
2015-02-23 11:32:04 -05:00
Nick Mathewson
cf7aa7b926
changes file for 5246e8f992
2015-02-23 11:24:13 -05:00
cypherpunks
5246e8f992
Remove lingering mempool code
2015-02-23 11:19:31 -05:00
rl1987
385558c32f
Fix endianness issues in test_config_resolve_my_address().
...
Since resolve_my_address() yields IP address in host order there is
no need to use byteorder functions for conversion.
2015-02-23 09:57:17 -05:00
Nick Mathewson
8a9d86bf05
Merge remote-tracking branch 'public/bug11454_11457'
2015-02-20 01:08:12 -05:00
Nick Mathewson
03a4e97c76
Merge remote-tracking branch 'origin/maint-0.2.5'
2015-02-20 01:05:21 -05:00
Nick Mathewson
1525eeeb49
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-02-20 01:04:49 -05:00
Nick Mathewson
5334bcd7e3
bump version to 0.2.6.3-alpha-dev
2015-02-19 17:20:40 -05:00
Nick Mathewson
7df7e8d71d
Adjust changelog to combine 3 sections about the same thing
2015-02-19 15:37:09 -05:00
Nick Mathewson
a6cd3f26d9
Pick a date (today)
2015-02-19 13:16:47 -05:00
Nick Mathewson
251f6cfcd8
Quiet "caching debian-tor for debian-tor" notice
2015-02-19 12:30:34 -05:00
Nick Mathewson
7b03e9a8c7
fold one more entry into the changelog
2015-02-19 11:36:27 -05:00
Nick Mathewson
a17470a623
Merge branch 'AUTHDIR_NEWDESC_enough_squashed'
2015-02-19 11:35:32 -05:00
Nick Mathewson
76d8c23ab4
Try to fix authdir_newdesc events
...
We were sending values that were truncated by the length of the
annotations.
2015-02-19 11:35:27 -05:00
Nick Mathewson
cef802a041
Increment version to 0.2.6.3-alpha
2015-02-19 10:05:08 -05:00
Nick Mathewson
0cdc321ae9
Merge changes into changelog
2015-02-19 09:56:38 -05:00
Nick Mathewson
4fde9cdf86
appease lintchanges
2015-02-19 09:55:18 -05:00
Nick Mathewson
94a877381d
Check for # characters in lintchanges
2015-02-19 09:54:09 -05:00
Nick Mathewson
61f9030409
reflow 0.2.6.3 changelog
2015-02-19 09:54:00 -05:00
Nick Mathewson
b099e73daf
answer some of roger's questions
2015-02-19 09:53:38 -05:00
Nick Mathewson
b897e386da
Merge branch 'bug12844_macros'
2015-02-19 09:41:36 -05:00
Nick Mathewson
85f97941df
Merge branch 'bug13762_quiet_squashed'
2015-02-19 09:40:41 -05:00
Nick Mathewson
557a0c83f3
Do not try to download an EI for which we don't have a matching SD.
...
This quiets some log messages for #13762 , and adds a better INFO message
for the underlying confusion.
2015-02-19 09:40:36 -05:00
Roger Dingledine
0d46978de6
sorry brits
2015-02-19 09:26:32 -05:00
Roger Dingledine
df4b440752
final cleanups
2015-02-19 09:25:34 -05:00
Roger Dingledine
0615cc82d4
reach into the past and fix two changelog stanzas
2015-02-19 09:11:13 -05:00
Nick Mathewson
86105a4009
Check ENABLE_TOR2WEB_MODE before any tor2webmode code
2015-02-19 09:09:25 -05:00
Roger Dingledine
55e2c0536d
some more changelog cleanups
2015-02-19 09:07:14 -05:00
Roger Dingledine
0e22da1b8d
continue cleaning changelog, and add a question for nick
2015-02-19 08:42:01 -05:00
Roger Dingledine
91f0dc3abd
cleanup and ask two questions for nick
2015-02-19 07:28:04 -05:00
Roger Dingledine
7272ad2e17
clean up nickm's changelog entry for #14918
...
now that I made it log "never" rare than "less often".
2015-02-19 06:41:21 -05:00
