c470a6d278
Merge remote-tracking branch 'teor/bug24488'
2017-12-06 14:44:03 -05:00
91f72bbb6c
Merge remote-tracking branch 'teor/bug24489'
2017-12-06 14:37:15 -05:00
aa6212a858
Merge remote-tracking branch 'dgoulet/bug24502_032_01'
2017-12-06 14:31:33 -05:00
a7a0cebb59
Merge branch 'more_directories_squashed'
2017-12-05 19:49:45 -05:00
46f167886a
add a changes file
2017-12-05 19:49:29 -05:00
e8a6a6635b
Merge branch 'dgoulet_ticket20699_033_01'
2017-12-05 19:43:23 -05:00
5d4fc193f9
control: Add changes file for HSv3 control port
...
Part of #20699 .
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-12-05 19:39:46 -05:00
1969d57363
Change our build process to run Cargo from inside the build tree
...
Instead of using the cwd to specify the location of Cargo.toml, we
use the --manifest-path option to specify its location explicitly.
This works around the bug that isis diagnosed on our jenkins builds.
2017-12-05 14:23:55 -05:00
a798ba6e9b
Merge branch 'maint-0.3.2'
2017-12-05 12:10:06 -05:00
779e4b9dcf
Tweaks to strings in 24500
2017-12-05 12:09:57 -05:00
313360e6e6
Make errno error log more useful for getrandom()
...
Making errno error log more useful for getrandom() call. Adding if statement to
make difference between ENOSYS and other errors.
Fixes #24500
Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com >
2017-12-05 12:05:09 -05:00
97702c69b0
sched: Set channel scheduler state to IDLE when not opened
...
In the KIST main loop, if the channel happens to be not opened, set its state
to IDLE so we can release it properly later on. Prior to this fix, the channel
was in PENDING state, removed from the channel pending list and then kept in
that state because it is not opened.
This bug was introduced in commit dcabf801e5Fixes #24502
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-12-04 14:48:15 -05:00
0694a6dc01
Don't pass --quiet to cargo for now
...
Fixes bug 24518.
2017-12-04 14:19:22 -05:00
ff0db77f91
Merge remote-tracking branch 'isis/bug22907'
2017-12-04 14:12:03 -05:00
fcefd69b80
Merge branch 'maint-0.3.2'
2017-12-04 14:01:55 -05:00
a5be2305e1
fix check-changes warning
2017-12-04 14:01:52 -05:00
70b19894ae
Merge branch 'maint-0.3.2'
2017-12-04 13:23:52 -05:00
ff6c8cf861
sched: Downgrade warning log to info in KIST
...
Some platforms don't have good monotonic time support so don't warn when the
diff between the last run of the scheduler time and now is negative. The
scheduler recovers properly from this so no need to be noisy.
Fixes #23696
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-12-04 12:22:02 -05:00
f50d64b62e
Merge branch 'bug23826-23828_squashed'
2017-12-04 11:43:11 -05:00
a2c09f6751
Changes file for #23826 , #23828 , and #23870
2017-12-04 11:42:56 -05:00
9acfd70f26
Sprinkle some consts in networkstatus_getinfo_by_purpose()
...
And note where we change the running flag, but probably shouldn't.
Implements ticket 24489.
2017-12-02 21:21:41 +11:00
f1a5000b98
Make set_routerstatus_from_routerinfo() set IPv6 unspecified addresses
...
When creating a routerstatus (vote) from a routerinfo (descriptor),
set the IPv6 address to the unspecified IPv6 address, and explicitly
initialise the port to zero.
Also clarify the documentation for the function.
Fixes bug 24488; bugfix on 0.2.4.1-alpha.
2017-12-02 21:00:22 +11:00
b86c9acac3
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-01 12:13:40 -05:00
cf3da63b90
Merge branch 'maint-0.3.2'
2017-12-01 12:13:40 -05:00
5c03bb7c0c
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-01 12:13:40 -05:00
3bca705c54
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-01 12:13:40 -05:00
953a8f8510
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-01 12:13:40 -05:00
f97f301b5b
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-01 12:13:39 -05:00
461e34bb3d
Fix a clang compilation warning in rendservice.c
...
Fixes bug 24480; bugfix on 0.2.5.16.
2017-12-01 12:13:15 -05:00
699899cbff
remove changes files that are going into 0.3.2.6-alpha or earlier.
2017-11-30 12:31:23 -05:00
cef844d017
Merge branch 'maint-0.3.2'
2017-11-30 12:07:59 -05:00
fd73a168ca
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-11-30 12:07:59 -05:00
ee48eb1eb5
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-30 12:07:59 -05:00
5fc0587c04
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-30 12:07:59 -05:00
7e2b012b46
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-30 12:07:59 -05:00
ba4a9cf0c0
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-11-30 12:07:59 -05:00
d459c08b7d
Merge branch 'trove-2017-012_030' into maint-0.3.0
2017-11-30 12:07:43 -05:00
52d7af631c
Merge branch 'trove-2017-010_029' into maint-0.2.9
2017-11-30 12:07:26 -05:00
f49876d66e
Merge branch 'trove-2017-012_025' into maint-0.2.5
2017-11-30 12:06:21 -05:00
08ce39fb0f
Merge branch 'trove-2017-011_025' into maint-0.2.5
2017-11-30 12:06:17 -05:00
a6a0c7a4ec
Merge branch 'trove-2017-009_025' into maint-0.2.5
2017-11-30 12:05:59 -05:00
75509dc827
Fix changes file
2017-11-30 11:52:40 -05:00
500f04a74e
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-30 11:48:12 -05:00
766d0a2d98
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-30 11:48:12 -05:00
072e194a15
Merge branch 'bug21394_029' into maint-0.2.9
2017-11-30 11:48:06 -05:00
1c7121be54
Merge branch 'bug24119_squashed'
2017-11-30 08:00:34 -05:00
49a4961dad
Add changes/bug24119
2017-11-30 08:00:24 -05:00
bef461ef1f
Switch -Wnormalized=id to -Wnormalized=nfkc
...
Modified -Wnormalized flag to nfkc option in configure.ac to avoid source code
identifier confusion.
Fixes #24467
Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com >
2017-11-29 20:29:55 -05:00
27f017639f
Merge branch 'ticket20020'
2017-11-29 20:24:34 -05:00
6a9c3d6e3a
Merge branch 'maint-0.3.2'
2017-11-29 12:02:44 -05:00
Nick Mathewson
David Goulet
Fernando Fernandez Mancera
teor
Alex Xu (Hello71)