Nick Mathewson
72832086e2
Use a single free-and-exit strategy in config_process_include.
...
This avoids a double-free when a pointer already freed with
tor_free(config_line) is freed again in the cleanup-and-exit code.
Fixes bug 23155.
2017-08-08 20:08:43 -04:00
Nick Mathewson
a47b8fcf92
Merge branch 'bug23139' into maint-0.3.1
2017-08-08 19:29:05 -04:00
Nick Mathewson
5368eaf62b
chages file on 22286
2017-08-08 10:09:54 -04:00
Nick Mathewson
7465ea4ad9
Remove some LCOV_EXCL stuff that I think may be testable after all.
...
This is partial revert on 22286.
Also, tweak some log messages to be distinct.
2017-08-08 10:08:06 -04:00
Nick Mathewson
6121ca16bc
Merge remote-tracking branch 'ahf/bugs/22286' into maint-0.3.1
2017-08-08 10:03:08 -04:00
Nick Mathewson
3af4aafbcb
Fix a memory leak in consdiffmgr.c
...
Fixes bug 23139; bugfix on 0.3.1.1-alpha.
2017-08-08 09:13:45 -04:00
Nick Mathewson
1168e21b45
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-03 09:14:12 -04:00
Nick Mathewson
b548371f76
Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0
2017-08-03 09:12:23 -04:00
Nick Mathewson
b13bf65062
Merge branch 'bug23081_025' into maint-0.3.1
2017-08-03 09:10:58 -04:00
Nick Mathewson
3e68db02c4
In ntmain, call set_main_thread() before running the loop.
...
Patch from Vort; fixes bug 23081; bugfix on fd992deeea
2017-08-03 09:09:08 -04:00
Nick Mathewson
93b28972c1
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-08-03 08:44:31 -04:00
Nick Mathewson
9696021593
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-08-03 08:44:31 -04:00
Nick Mathewson
f33c96610f
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-03 08:44:31 -04:00
Nick Mathewson
e220e6e437
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-03 08:44:31 -04:00
Karsten Loesing
1280de42a4
Update geoip and geoip6 to the August 3 2017 database.
2017-08-03 10:00:54 +02:00
Nick Mathewson
a9a8d53dec
Merge branch 'bug23071_031' into maint-0.3.1
2017-08-02 12:51:42 -04:00
Nick Mathewson
ee849ee8b6
Make the hs_ntor_ref logic more correct when there is no sha3 module
2017-08-02 12:44:46 -04:00
Nick Mathewson
830b7b31b5
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid version bump.
2017-08-02 12:28:43 -04:00
Nick Mathewson
8925e84beb
version bump to 0.3.0.10-dev
2017-08-02 12:28:34 -04:00
Nick Mathewson
71248800f7
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"Ours merge" to avoid version bump.
2017-08-01 14:38:57 -04:00
Nick Mathewson
4f7955d5de
Bump to 0.3.0.10
2017-08-01 14:38:49 -04:00
David Goulet
ff9c529667
hs: Cleanup logging statement in hs_intropoint.c
...
One log statement was a warning and has been forgotten. It is triggered for a
successful attempt at introducting from a client.
It has been reported here:
https://lists.torproject.org/pipermail/tor-relays/2017-August/012689.html
Three other log_warn() statement changed to protocol warning because they are
errors that basically can come from the network and thus triggered by anyone.
Fixes #23078 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-08-01 14:15:47 -04:00
Nick Mathewson
9c294d29ea
bump to 0.3.1.5-alpha-dev
2017-08-01 12:08:30 -04:00
Nick Mathewson
4d26203528
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:30:33 -04:00
Nick Mathewson
b2d528d3be
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:30:33 -04:00
Nick Mathewson
58e1c6dd86
Merge remote-tracking branch 'public/bug19769_19025_029' into maint-0.2.9
2017-08-01 11:30:29 -04:00
Nick Mathewson
751c718273
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:28:40 -04:00
Nick Mathewson
f69797b67c
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:28:39 -04:00
Nick Mathewson
8500f0e4e1
Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9
2017-08-01 11:28:36 -04:00
Nick Mathewson
bf91b6e05f
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:24:09 -04:00
Nick Mathewson
84c4a2bc3f
Merge remote-tracking branch 'public/bug20270_029' into maint-0.3.0
2017-08-01 11:24:02 -04:00
Nick Mathewson
9b65d7f415
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:23:01 -04:00
Nick Mathewson
7c68b2f1a5
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:23:00 -04:00
Nick Mathewson
2b94b0ea72
Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9
2017-08-01 11:22:42 -04:00
Nick Mathewson
5a739e59a4
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:21:19 -04:00
Nick Mathewson
1d48712c28
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:21:19 -04:00
Nick Mathewson
f6ecda8400
Merge remote-tracking branch 'public/bug18100_029' into maint-0.2.9
2017-08-01 11:21:14 -04:00
Nick Mathewson
4a19498edc
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:19:30 -04:00
Nick Mathewson
9d24a352c0
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:19:30 -04:00
Nick Mathewson
0e7558ab64
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-08-01 11:19:29 -04:00
Nick Mathewson
925ef048a9
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-08-01 11:19:29 -04:00
Nick Mathewson
a48ae2aa67
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-08-01 11:19:29 -04:00
Nick Mathewson
6862eada65
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-08-01 11:19:29 -04:00
Nick Mathewson
0bfd1c318c
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-08-01 11:19:28 -04:00
Nick Mathewson
6199e27a2b
Merge remote-tracking branch 'karsten/geoip-jul2017' into maint-0.2.4
2017-08-01 11:19:24 -04:00
Nick Mathewson
ec99f038fa
Improve the keypin failure message
...
Closes the human-factors part of ticket 22348.
2017-07-31 20:40:23 -04:00
Nick Mathewson
8b5b7d470f
Fix the hs_ntor integration tests to work with the pysha3 module
...
The sha3 module should still work. Fixes bug 23071; bugfix on
0.3.1.1-alpha.
2017-07-31 20:28:42 -04:00
Nick Mathewson
2cb8c8d99f
Bump to 0.3.1.5-alpha
2017-07-31 14:29:33 -04:00
Nick Mathewson
eb677c5870
Fix an unreachable memory leak in the unit tests
...
This is CID 1415726.
2017-07-28 09:52:34 -04:00
Nick Mathewson
911e2dc530
Merge branch 'bug23053_029' into maint-0.3.1
2017-07-28 09:50:16 -04:00
