rl1987
0deea98d02
Improve pre-push.git-hook description
2019-03-05 14:26:09 -05:00
rl1987
f3eac74ed9
In pre-push hook script, actually check local and remote refs
2019-03-05 14:26:09 -05:00
rl1987
ae5a0f39cd
Update git pre-push hook so that only upstream branches can get pushed to origin
2019-03-05 14:26:09 -05:00
Nick Mathewson
f1890707cc
Merge branch 'maint-0.4.0'
2019-03-05 13:00:07 -05:00
David Goulet
a999cb43df
protover: Add missing Padding to translate_to_rust
...
This commit also explicitly set the value of the PRT enum so we can match/pin
the C enum values to the Rust one in protover/ffi.rs.
Fixes #29631
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-03-05 12:33:43 -05:00
Nick Mathewson
d24acc008d
Merge remote-tracking branch 'tor-github/pr/759'
2019-03-05 12:01:28 -05:00
Nick Mathewson
f8e38d21c2
Merge remote-tracking branch 'tor-github/pr/753'
2019-03-05 11:57:20 -05:00
Nick Mathewson
72751f0c30
Merge remote-tracking branch 'tor-github/pr/680'
2019-03-05 11:53:31 -05:00
Alexander Færøy
c9a9de120f
Fix changelog for ticket 25614 to make it pass check-changes.
...
Yawning's commit in fda61e030e
was used to
find which version this is a bugfix on.
2019-03-05 15:50:30 +01:00
David Fifield
4578c3eb21
Set TOR_PT_EXIT_ON_STDIN_CLOSE=1 for client transports too.
...
Closes #25614 .
2019-03-05 15:24:31 +01:00
George Kadianakis
c5da1f1cd5
Merge branch 'tor-github/pr/723'
2019-03-04 18:55:28 +02:00
George Kadianakis
fe2552ad65
Merge branch 'tor-github/pr/739'
2019-03-04 18:52:19 +02:00
teor
f186f21a4e
doc: Fix an incorrect comment about calling FreeLibrary() on Windows
...
There's an incorrect comment in compat_time.c that suggests we call
FreeLibrary() before we're done using the library's functions.
See 29642 for background.
Closes ticket 29643.
2019-03-04 11:29:15 +10:00
rl1987
27eec50527
manpage: fix formatting of example on quoting options with spaces
2019-03-03 11:51:08 +02:00
David Goulet
13e93bdfd5
Merge branch 'tor-github/pr/718'
2019-03-01 09:36:23 -05:00
David Goulet
436e0c8ca4
maint: Make git scripts fetch origin once
...
Replace the "git pull" by one single "git fetch origin" and then "git merge"
into each defined branches.
This speeds up the process considerably.
Closes #29616
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-03-01 09:24:46 -05:00
Nick Mathewson
cb0d403049
Merge remote-tracking branch 'tor-github/pr/677'
2019-03-01 08:22:43 -05:00
Nick Mathewson
64f594499a
Document crypto_fast_rng_one_in_n.
2019-03-01 08:20:54 -05:00
teor
2d5c6cddc4
Merge branch 'maint-0.4.0'
2019-03-01 14:17:54 +10:00
teor
955a622391
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-01 14:17:31 +10:00
teor
1c248fa27d
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-03-01 14:16:59 +10:00
teor
f56645917e
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-03-01 14:16:22 +10:00
teor
76b55fde81
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-03-01 14:15:59 +10:00
teor
7786198eef
Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9
2019-03-01 14:15:00 +10:00
teor
c1ab538479
Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9
2019-03-01 14:14:51 +10:00
teor
ecbc2e80a0
Merge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9
2019-03-01 14:14:26 +10:00
Mike Perry
e8d84b18aa
Bug 25733: Avoid assert failure if all circuits time out.
...
Prior to #23100 , we were not counting HS circuit build times in our
calculation of the timeout. This could lead to a condition where our timeout
was set too low, based on non HS circuit build times, and then we would
abandon all HS circuits, storing no valid timeouts in the histogram.
This commit avoids the assert.
2019-03-01 13:48:01 +10:00
Kris Katterjohn
389ee834b6
Log the correct "auto" port number for listening sockets
...
When "auto" was used for the port number for a listening socket, the
message logged after opening the socket would incorrectly say port 0
instead of the actual port used.
Fixes bug 29144; bugfix on 0.3.5.1-alpha
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-03-01 12:34:21 +10:00
David Goulet
9256b02cc8
maint: Remove 0.3.3 branch from git scripts
...
It is EOL today: Febuary 28th, 2019
No more releases will occur.
Closes #29616
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-02-28 13:16:41 -05:00
Nick Mathewson
d5f6137547
Merge branch 'maint-0.4.0'
2019-02-28 11:22:06 -05:00
Nick Mathewson
dc19d65c3b
Merge remote-tracking branch 'tor-github/pr/728' into maint-0.4.0
2019-02-28 11:20:26 -05:00
George Kadianakis
cec555f44c
Merge branch 'tor-github/pr/720'
2019-02-28 12:32:16 +02:00
teor
600f5f0db4
Merge branch 'maint-0.4.0'
2019-02-28 10:50:01 +10:00
teor
aef6e61347
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-02-28 10:49:47 +10:00
teor
de0969ef78
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-28 10:49:33 +10:00
teor
6a61a020ee
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-28 10:49:19 +10:00
teor
be71cce9f8
Merge remote-tracking branch 'tor-github/pr/731' into maint-0.3.3
2019-02-28 10:48:46 +10:00
teor
065cfc473b
Merge branch 'maint-0.4.0'
2019-02-28 10:46:29 +10:00
teor
90c8956e21
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-02-28 10:46:14 +10:00
teor
be29dfedd9
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-28 10:45:59 +10:00
teor
524731503e
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-28 10:45:44 +10:00
teor
3313444ef0
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-28 10:45:30 +10:00
Neel Chauhan
c142e3d1e6
Set CIRCLAUNCH_NEED_UPTIME in rend_service_relaunch_rendezvous() on a hs_service_requires_uptime_circ()
2019-02-27 17:37:10 -05:00
teor
78bfe731c3
appveyor: Do the 64-bit Windows Server 2016 job first
2019-02-28 07:44:15 +10:00
teor
a479909ee8
appveyor: skip two redundant builds to speed up CI on Windows
...
Skip the Appveyor 32-bit Windows Server 2016 job, and 64-bit Windows
Server 2012 R2 job. The remaining 2 jobs still provide coverage of
64/32-bit, and Windows Server 2016/2012 R2.
Also set fast_finish, so failed jobs terminate the build immediately.
Fixes bug 29601; bugfix on 0.3.5.4-alpha.
2019-02-28 07:43:57 +10:00
George Kadianakis
31c1d91ffb
Exit with 1 if new issues were found. Also work with python3.
2019-02-27 19:31:41 +02:00
George Kadianakis
2a722e2841
Improve metrics implementation.
...
No longer messes up with MOCK_IMPL. Also update the tests to show that. We are
still being innacurate on the line count in some cases, but that doesnt matter
so much.
2019-02-27 19:31:15 +02:00
George Kadianakis
26c4f6cfd0
Add more intelligent problem tracking.
2019-02-27 18:34:13 +02:00
George Kadianakis
371ea65c08
Improve #include counting func and move it to metrics.py.
2019-02-27 17:05:00 +02:00
Nick Mathewson
761eb4cf79
Merge branch 'maint-0.4.0'
2019-02-27 09:59:42 -05:00