Nick Mathewson
0d4addfc73
Merge branch 'bug23952_032' into maint-0.3.2
2017-10-24 08:24:12 -04:00
Nick Mathewson
f0a6ea0bfd
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-23 15:55:48 -04:00
Nick Mathewson
b1d6cf2508
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-23 15:55:48 -04:00
Nick Mathewson
9ae4ffc076
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 15:55:08 -04:00
Nick Mathewson
b1bd1bf19f
Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9
2017-10-23 15:53:45 -04:00
Nick Mathewson
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
Nick Mathewson
8b8d501040
Merge branch 'maint-0.3.1' into maint-0.3.2
...
"ours" merge to avoid taking af33fdd7c1
2017-10-23 09:22:43 -04:00
Nick Mathewson
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
Nick Mathewson
fcd5c3144a
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-23 09:11:10 -04:00
Nick Mathewson
eac4c374e4
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 09:11:10 -04:00
Nick Mathewson
6a7aa47357
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-23 09:11:10 -04:00
Nick Mathewson
85115796bb
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-23 09:11:10 -04:00
Nick Mathewson
a5f5bda462
Adjust test, now that there are 9 dirauths again
2017-10-23 09:11:07 -04:00
Nick Mathewson
1db5081ba1
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-23 09:06:34 -04:00
Nick Mathewson
c93ecb8189
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 09:06:34 -04:00
Nick Mathewson
009141c6a8
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-23 09:06:34 -04:00
Nick Mathewson
23e3d57e12
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-23 09:06:34 -04:00
Nick Mathewson
8cc147aa83
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-23 09:04:56 -04:00
David Goulet
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
Nick Mathewson
c958fda6e2
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-23 08:59:11 -04:00
Nick Mathewson
783e458c07
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 08:59:11 -04:00
Nick Mathewson
b8dedaee74
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-23 08:59:11 -04:00
Nick Mathewson
df57d1e0c0
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-23 08:59:11 -04:00
Nick Mathewson
9a1b385462
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-23 08:58:28 -04:00
Nick Mathewson
132e2f69b1
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-23 08:53:25 -04:00
Nick Mathewson
74e8fd22c9
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 08:53:25 -04:00
Nick Mathewson
578eead1c8
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-23 08:53:25 -04:00
Nick Mathewson
b68de63eb6
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-23 08:53:25 -04:00
Nick Mathewson
6f87a85897
Merge remote-tracking branch 'public/bug23690_028' into maint-0.2.8
2017-10-23 08:53:14 -04:00
Nick Mathewson
bae96cf1dc
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-23 08:47:59 -04:00
Nick Mathewson
35574d4a9a
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 08:47:58 -04:00
Nick Mathewson
9120ac2218
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-23 08:47:58 -04:00
Nick Mathewson
fcaf3335b4
Merge remote-tracking branch 'public/bug23081_025' into maint-0.2.9
2017-10-23 08:47:52 -04:00
Nick Mathewson
a46288252b
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-23 08:46:29 -04:00
Nick Mathewson
d29e4c0597
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 08:46:29 -04:00
Nick Mathewson
5d37d27007
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-23 08:46:29 -04:00
Nick Mathewson
68dea082e7
Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9
2017-10-23 08:46:26 -04:00
Nick Mathewson
5d219ecf98
Update Longclaw's IP address; fixes 23592.
2017-10-17 14:00:30 -04:00
Nick Mathewson
9298749088
Add dirauth changes as a lintchanges category
2017-10-17 13:58:21 -04:00
teor
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
Nick Mathewson
22139c0b28
Merge remote-tracking branch 'catalyst-oniongit/bug23757'
2017-10-10 14:09:49 -04:00
Nick Mathewson
d9321d697d
Merge remote-tracking branch 'catalyst-oniongit/bug23755'
2017-10-10 14:07:34 -04:00
Taylor Yu
3ae5b32aaa
Match .travis.yml more closely
...
Adjust the GitLab CI configuration to more closely match that of
Travis CI. Fixes bug 23757.
2017-10-05 22:42:00 -05:00
Taylor Yu
d5d811e2d0
Only run "update" job from scheduled pipelines
...
Stop attempting to unconditionally mirror the tor repository in GitLab
CI. This prevented developers from enabling GitLab CI on master
because the "update" job would attempt to run, causing an unuseful CI
failure. Fixes bug 23755.
2017-10-05 13:37:57 -05:00
Nick Mathewson
91c17ffbd6
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-05 11:04:59 -04:00
Nick Mathewson
f7f55acae9
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-05 11:04:59 -04:00
Nick Mathewson
7a4741c233
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-05 11:04:59 -04:00
Nick Mathewson
43ebe54a24
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-05 11:04:59 -04:00
Nick Mathewson
51e47481fc
Merge branch 'maint-0.3.1'
2017-10-05 11:04:59 -04:00
Nick Mathewson
2e21493a88
add missing subcategory in changes file
2017-10-05 11:04:54 -04:00
