8cc57bccfe
Isis has been noticing typos.
2017-10-24 19:37:09 -04:00
649000662d
Merge remote-tracking branch 'arma/ticket23637'
2017-10-24 12:52:41 -04:00
abbd6a36fc
Merge branch 'maint-0.3.2'
2017-10-24 08:25:29 -04:00
0d4addfc73
Merge branch 'bug23952_032' into maint-0.3.2
2017-10-24 08:24:12 -04:00
f7707c9031
Merge branch 'maint-0.3.2'
2017-10-23 15:55:48 -04:00
b1d6cf2508
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-23 15:55:48 -04:00
f0a6ea0bfd
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-23 15:55:48 -04:00
9ae4ffc076
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 15:55:08 -04:00
b1bd1bf19f
Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9
2017-10-23 15:53:45 -04:00
48ee85e0c6
Have LOG_PROTOCOL_WARN call its own function
...
Also, make the function that implements LOG_PROTOCOL_WARN use a
cached value of the desired loglevel, rather than calling
get_options().
2017-10-23 12:22:26 -04:00
af33fdd7c1
Remove the length limit from write_http_status_line
...
Fixes bug 23908; bugfix on 0.3.1.6-rc when we made the keypin
failure message really long.
Backport from 0.3.2's 771fb7e7ba
2017-10-23 09:21:22 -04:00
eac4c374e4
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 09:11:10 -04:00
fcd5c3144a
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-23 09:11:10 -04:00
49e8352f16
Merge branch 'maint-0.3.2'
2017-10-23 09:11:10 -04:00
6a7aa47357
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-23 09:11:10 -04:00
85115796bb
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-23 09:11:10 -04:00
a5f5bda462
Adjust test, now that there are 9 dirauths again
2017-10-23 09:11:07 -04:00
c93ecb8189
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 09:06:34 -04:00
1db5081ba1
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-23 09:06:34 -04:00
d99c6b7252
Merge branch 'maint-0.3.2'
2017-10-23 09:06:34 -04:00
009141c6a8
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-23 09:06:34 -04:00
23e3d57e12
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-23 09:06:34 -04:00
8cc147aa83
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-23 09:04:56 -04:00
15a699462d
dirauth: Add bastet to the default authorities
...
Fixes #23910
Based on a patch by dgoulet; backported to 0.2.5
2017-10-23 09:03:36 -04:00
97046436b2
Merge branch 'maint-0.3.2'
2017-10-23 08:59:12 -04:00
783e458c07
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 08:59:11 -04:00
c958fda6e2
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-23 08:59:11 -04:00
b8dedaee74
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-23 08:59:11 -04:00
df57d1e0c0
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-23 08:59:11 -04:00
9a1b385462
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-23 08:58:28 -04:00
74e8fd22c9
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 08:53:25 -04:00
132e2f69b1
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-23 08:53:25 -04:00
b68de63eb6
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-23 08:53:25 -04:00
6f87a85897
Merge remote-tracking branch 'public/bug23690_028' into maint-0.2.8
2017-10-23 08:53:14 -04:00
35574d4a9a
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 08:47:58 -04:00
fcaf3335b4
Merge remote-tracking branch 'public/bug23081_025' into maint-0.2.9
2017-10-23 08:47:52 -04:00
d29e4c0597
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 08:46:29 -04:00
68dea082e7
Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9
2017-10-23 08:46:26 -04:00
35746a9ee7
Comment-only change: annotate exit() calls.
...
Sometimes when we call exit(), it's because the process is
completely hopeless: openssl has a broken AES-CTR implementation, or
the clock is in the 1960s, or something like that.
But sometimes, we should return cleanly from tor_main() instead, so
that embedders can keep embedding us and start another Tor process.
I've gone through all the exit() and _exit() calls to annotate them
with "exit ok" or "XXXX bad exit" -- the next step will be to fix
the bad exit()s.
First step towards 23848.
2017-10-19 13:42:28 -04:00
0956242158
Mark some unreachable code in compat_winthreads.c as unreachable
2017-10-19 13:21:48 -04:00
5d219ecf98
Update Longclaw's IP address; fixes 23592.
2017-10-17 14:00:30 -04:00
d8604b8729
Merge branch 'teor_bug23813_squashed'
2017-10-15 20:36:23 -04:00
eaf9c0f25a
Describe what router_reset_descriptor_download_failures() actually does
...
Comment-only change.
Part of #23813 .
2017-10-15 20:36:18 -04:00
5bca66be49
Clear the address when node_get_prim_orport() returns early
...
Fixes bug 23874; bugfix on 0.2.8.2-alpha.
2017-10-15 16:48:36 -04:00
e00f12ec6c
bump version on master to 0.3.3.0-alpha-dev
2017-10-15 11:57:06 -04:00
bdf60fc7ce
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-05 11:03:36 -04:00
0cd7c1af37
Merge branch 'maint-0.3.1'
2017-10-05 11:03:36 -04:00
d6bdec1595
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-05 11:03:35 -04:00
ad7db10770
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-05 11:03:35 -04:00
2984d99165
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-05 11:03:35 -04:00
Nick Mathewson
David Goulet
teor