 Nick Mathewson
|
c9a3525c70
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
2017-11-27 09:09:34 -05:00 |
|
|
Nick Mathewson
|
30b3229252
|
Merge branch 'maint-0.2.8' into maint-0.2.9
|
2017-11-27 09:09:34 -05:00 |
|
 Sebastian Hahn
|
25c90230be
|
Add bastet's ipv6 address
Implements ticket 24394
|
2017-11-27 09:09:16 -05:00 |
|
|
Nick Mathewson
|
e5cf65e8ea
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
2017-11-18 11:03:16 -05:00 |
|
|
Nick Mathewson
|
53c3174ee4
|
Merge branch 'maint-0.2.8' into maint-0.2.9
|
2017-11-18 11:01:43 -05:00 |
|
|
Nick Mathewson
|
d388f9d879
|
Merge branch 'maint-0.2.5' into maint-0.2.8
|
2017-11-18 11:01:33 -05:00 |
|
|
Nick Mathewson
|
9f2efd02a1
|
Minimal implementation of bridge-distribution-request
Just advertise the line when we're a bridge, using "any" if we're
published or "none" if we aren't.
This is done in lieu of a full backport of #18329.
|
2017-11-13 20:44:51 -05:00 |
|
|
Nick Mathewson
|
b84815881f
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
2017-11-13 20:36:04 -05:00 |
|
|
Nick Mathewson
|
1b9bb2c847
|
Merge branch 'bug22895_027' into maint-0.2.9
|
2017-11-13 20:35:59 -05:00 |
|
|
Nick Mathewson
|
dbb9ec494f
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
2017-11-13 12:57:58 -05:00 |
|
|
Nick Mathewson
|
543fd89fb7
|
Merge branch 'maint-0.2.8' into maint-0.2.9
|
2017-11-13 12:57:58 -05:00 |
|
|
Nick Mathewson
|
800797e7f3
|
Merge branch 'bug23291_028' into maint-0.2.8
|
2017-11-13 12:57:55 -05:00 |
|
|
Nick Mathewson
|
97c3fac6d4
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
2017-11-13 11:18:02 -05:00 |
|
|
Nick Mathewson
|
ab415ae950
|
Merge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9
|
2017-11-13 11:17:58 -05:00 |
|
|
Nick Mathewson
|
420e8737b4
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
2017-11-13 11:15:50 -05:00 |
|
|
Nick Mathewson
|
666653758d
|
Merge branch 'bug8185_025' into maint-0.2.9
|
2017-11-13 11:15:47 -05:00 |
|
|
Nick Mathewson
|
15179a3e01
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
2017-11-13 11:13:22 -05:00 |
|
|
Nick Mathewson
|
c928fb988a
|
Merge branch 'ticket21953_029' into maint-0.2.9
|
2017-11-13 11:13:18 -05:00 |
|
|
Nick Mathewson
|
c9b76a12f5
|
Merge branch 'maint-0.2.5' into maint-0.2.8
|
2017-11-11 12:23:33 -05:00 |
|
|
Nick Mathewson
|
c24b90e3ac
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
2017-11-11 12:23:33 -05:00 |
|
|
Nick Mathewson
|
9666c620d5
|
Merge branch 'maint-0.2.8' into maint-0.2.9
|
2017-11-11 12:23:33 -05:00 |
|
 Karsten Loesing
|
6f8c32b7de
|
Update geoip and geoip6 to the November 6 2017 database.
|
2017-11-10 10:14:09 +01:00 |
|
|
Nick Mathewson
|
fecc5c61fc
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
2017-10-31 11:43:14 -04:00 |
|
|
Nick Mathewson
|
04d4786cc4
|
Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9
|
2017-10-31 11:43:07 -04:00 |
|
|
Nick Mathewson
|
3353942fde
|
start a changelog for 0.2.9.13
|
2017-10-24 08:56:43 -04:00 |
|
|
Nick Mathewson
|
4dad6123cf
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
2017-10-23 15:53:50 -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
|
d65016c0bb
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
2017-10-23 09:06:34 -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
|
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
|
b1445b19e4
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
2017-10-23 08:59:11 -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
|
9a1b385462
|
Merge branch 'maint-0.2.5' into maint-0.2.8
|
2017-10-23 08:58:28 -04:00 |
|
|
Nick Mathewson
|
d818f1e86d
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
2017-10-23 08:53:25 -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
|
6f87a85897
|
Merge remote-tracking branch 'public/bug23690_028' into maint-0.2.8
|
2017-10-23 08:53:14 -04:00 |
|
|
Nick Mathewson
|
94f478c84a
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
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
|
3bf1d81a1d
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
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 |
|
 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
|
91c17ffbd6
|
Merge branch 'maint-0.2.5' into maint-0.2.8
|
2017-10-05 11:04:59 -04:00 |
|
|
Nick Mathewson
|
4b6ba09674
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
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
|
2e21493a88
|
add missing subcategory in changes file
|
2017-10-05 11:04:54 -04:00 |
|
|
Nick Mathewson
|
d6bdec1595
|
Merge branch 'maint-0.2.5' into maint-0.2.8
|
2017-10-05 11:03:35 -04:00 |
|
|
Nick Mathewson
|
5d516315f5
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
2017-10-05 11:03:35 -04:00 |
|
|
Nick Mathewson
|
2984d99165
|
Merge branch 'maint-0.2.8' into maint-0.2.9
|
2017-10-05 11:03:35 -04:00 |
|