Nick Mathewson
75f7064a13
Merge branch 'maint-0.3.4'
2018-07-09 09:11:42 -04:00
Nick Mathewson
1af69c1812
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-09 09:11:41 -04:00
Nick Mathewson
451a84cecb
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-09 09:11:41 -04:00
Nick Mathewson
d3894dc34b
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-09 09:11:41 -04:00
Nick Mathewson
fead22fb2a
Merge remote-tracking branch 'mikeperry/bug25705_v3_033' into maint-0.3.3
2018-07-09 09:08:58 -04:00
Karsten Loesing
9faa28b60e
Update geoip and geoip6 to the July 3 2018 database.
2018-07-06 20:54:03 +02:00
Nick Mathewson
2878dad9db
Merge branch 'maint-0.3.4'
2018-07-03 13:31:26 -04:00
Nick Mathewson
32d9d69350
Merge remote-tracking branch 'github/bug26568_034' into maint-0.3.4
2018-07-03 13:16:37 -04:00
Nick Mathewson
df98582851
Merge remote-tracking branch 'github/ticket26626'
2018-07-03 12:52:43 -04:00
Nick Mathewson
fe8f774820
Merge branch 'bug26522'
2018-07-03 11:34:36 -04:00
rl1987
d0525c38d6
Refrain from potentially insecure usage of strncat()
2018-07-03 11:34:14 -04:00
Nick Mathewson
e2a94dc481
Require stdint.h and inttypes.h
...
We've been silently requiring stdint.h for a while now, and nobody
has complained. Closes ticket 26626.
2018-07-03 10:25:31 -04:00
Nick Mathewson
a01b4d7f87
Merge remote-tracking branch 'rl1987/ticket26527'
2018-07-03 09:53:46 -04:00
Nick Mathewson
a4e8f94507
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-03 09:48:03 -04:00
Nick Mathewson
4c094436c5
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-03 09:48:03 -04:00
Nick Mathewson
d38e474950
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-03 09:48:03 -04:00
Nick Mathewson
228d25ddf6
Merge branch 'maint-0.3.4'
2018-07-03 09:48:03 -04:00
rl1987
fedb3e46ec
Remove ATTR_NONNULL macro
2018-07-03 12:33:09 +03:00
Nick Mathewson
dfdf32404c
Partially revert "Use tor_addr_from_getsockname() in several places"
...
This reverts part of commit 6ed384b827
2018-07-02 16:11:02 -04:00
Nick Mathewson
3baf3d01cb
hs_ntor_ref.py: pass only strings to subprocess.Popen
...
Recent Python3 versions seem to require this on Windows.
Fixes bug 26535; bug copied from ntor_ref.py on 0.3.1.1-alpha.
2018-07-02 14:23:26 -04:00
Nick Mathewson
fc5f8b6931
ntor_ref.py: pass only strings to subprocess.Popen
...
Recent Python3 versions seem to require this on Windows.
Fixes bug 26535; bug introduced in f4be34f70d
2018-07-02 14:18:41 -04:00
Nick Mathewson
bfcfeaed07
Merge branch 'mikeperry_bug26214-rebased_squashed' into maint-0.3.4
2018-07-02 13:22:07 -04:00
Nick Mathewson
d6aa6549b5
Merge remote-tracking branch 'catalyst-github/moar-libs'
2018-07-02 12:22:37 -04:00
Nick Mathewson
cf8c3abff1
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-01 10:22:21 -04:00
Nick Mathewson
adcd1d8b9a
Merge branch 'maint-0.3.4'
2018-07-01 10:22:21 -04:00
Nick Mathewson
9aeef05f8f
Merge remote-tracking branch 'dgoulet/bug26523_033_01' into maint-0.3.3
2018-07-01 10:22:18 -04:00
Nick Mathewson
028523c801
Merge branch 'maint-0.3.4'
2018-06-30 09:15:39 -04:00
Nick Mathewson
e042727cf0
Merge remote-tracking branch 'catalyst-github/bug25895_034-squashed' into maint-0.3.4
2018-06-30 09:15:34 -04:00
Nick Mathewson
7a47379f25
Merge branch 'maint-0.3.4'
2018-06-29 13:06:16 -04:00
Nick Mathewson
f82f8179e6
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-29 13:06:15 -04:00
Nick Mathewson
f6b30a97a9
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-06-29 13:06:15 -04:00
Nick Mathewson
68dfbd5ef4
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-29 13:06:15 -04:00
Nick Mathewson
ea14d3408d
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-06-29 13:06:15 -04:00
Nick Mathewson
890bc15ab6
Changes file for 26467
2018-06-29 13:04:29 -04:00
Taylor Yu
f028713d37
Add more optional packages to Travis
...
Apparently we weren't building with either libcap or libseccomp on
Travis. Install libcap-dev and libseccomp-dev in .travis.yml. Closes
ticket 26560.
2018-06-28 17:25:43 -05:00
Alex Xu (Hello71)
614a78ddaa
Fix Rust cross compilation.
2018-06-27 14:42:06 -05:00
Nick Mathewson
b9b05e437d
Merge branch 'net_refactor'
2018-06-27 12:52:31 -04:00
David Goulet
3f8a12a63a
control: Make HSPOST properly parse HSADDRESS= param
...
For HSv3, the HSADDRESS= wasn't properly parsed for the HSPOST command. It now
correctly use it and furthermore sends back a "200 OK" in case the command is
successful for a v3 descriptor.
Fixes #26523
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-06-27 12:25:24 -04:00
Nick Mathewson
0742b38725
Revert "Use the "commands" argument of AC_CONFIG_FILES to make scripts +x"
...
This reverts commit 56c1fbf33f
2018-06-27 09:53:46 -04:00
Nick Mathewson
3930416dec
Link GetAdaptersAddresses, rather than loading it on-demand.
...
This function has been present since Windows XP.
2018-06-27 09:12:57 -04:00
Nick Mathewson
5f41bc91c6
Merge branch 'ticket26439'
2018-06-26 17:02:06 -04:00
Nick Mathewson
bf89278c79
Refactor bloom filter logic not to be digest-specific.
...
Now the address-set code and the digest-set code share the same
backend.
Closes ticket 26510
2018-06-26 13:27:23 -04:00
Nick Mathewson
c08102ea77
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-06-26 09:21:59 -04:00
Nick Mathewson
f8dad5a079
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-26 09:21:59 -04:00
Nick Mathewson
25226fb260
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-26 09:21:59 -04:00
Nick Mathewson
d6d3f8486d
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-06-26 09:21:59 -04:00
Nick Mathewson
b4e23dba93
Merge branch 'maint-0.3.4'
2018-06-26 09:21:59 -04:00
Nick Mathewson
56c1fbf33f
Use the "commands" argument of AC_CONFIG_FILES to make scripts +x
...
Closes ticket 26439.
2018-06-21 14:26:47 -04:00
Nick Mathewson
47ee7978fe
Prefer recent Python 3 in autoconf.
...
Closes ticket 26372.
2018-06-21 09:31:01 -04:00
Nick Mathewson
2ad062ee60
Merge branch 'mikeperry_bug26214-rebased_squashed'
2018-06-21 09:20:03 -04:00
