Nick Mathewson
320dcf65b7
Extract the crypto parts of circuit_package_relay_cell.
2018-03-17 10:16:41 -04:00
Nick Mathewson
2989326054
Rename 'relay_crypt' to 'relay_decrypt_cell'
...
This function is used upon receiving a cell, and only handles the
decrypting part. The encryption part is currently handled inside
circuit_package_relay_cell.
2018-03-17 10:05:25 -04:00
Nick Mathewson
4e5e973421
Merge remote-tracking branch 'public/restart_reset_bootstrap'
2018-03-14 12:12:37 +01:00
ArunaMaurya221B
42008ee721
DisableNetwork documentation improvised
2018-03-13 21:31:10 +01:00
ArunaMaurya221B
a9203c65f1
Revised patch with 78 characters per line
2018-03-13 21:28:37 +01:00
ArunaMaurya221B
c29e66a883
PaddingStatistics documented properly
2018-03-13 21:28:36 +01:00
Nick Mathewson
bebd5809f3
Merge remote-tracking branch 'teor/rust-std'
2018-03-13 16:15:00 -04:00
Nick Mathewson
03f748d0ca
Merge branch 'maint-0.3.3'
2018-03-13 11:03:08 -04:00
Nick Mathewson
f0f2fab5e1
Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3
2018-03-13 11:02:34 -04:00
Nick Mathewson
c6d364e8ae
Merge branch 'maint-0.3.3'
2018-03-13 10:59:56 -04:00
Nick Mathewson
6bc324c96a
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-13 10:59:30 -04:00
Nick Mathewson
d60dc27555
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-13 10:59:30 -04:00
Nick Mathewson
950606dcc9
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-13 10:58:03 -04:00
Nick Mathewson
38b7885c90
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-13 10:58:03 -04:00
Nick Mathewson
0e7f15fdb6
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-13 10:58:02 -04:00
Nick Mathewson
67a313f0ec
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-03-13 10:58:02 -04:00
Karsten Loesing
3418a3a7f0
Update geoip and geoip6 to the March 8 2018 database.
2018-03-13 10:57:49 -04:00
Nick Mathewson
1047ef140e
Merge branch 'maint-0.3.3'
2018-03-13 13:41:33 +01:00
Nick Mathewson
676a28599d
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-13 13:41:24 +01:00
Nick Mathewson
094294dbb1
Merge branch 'bug25474_032' into maint-0.3.2
2018-03-13 13:41:11 +01:00
Nick Mathewson
53a807e1e9
Add a missing prototype to our libevent configure stanza.
...
Fixes bug 25474; bugfix on 0.3.2.5-alpha.
2018-03-13 13:37:26 +01:00
Nick Mathewson
40154c1f9e
Merge branch 'maint-0.3.3'
2018-03-13 10:00:58 +01:00
Nick Mathewson
e9dbd6dd8f
Update the documentation in tor_api.h
2018-03-13 10:00:41 +01:00
Fernando Fernandez Mancera
c1cfa0fbc4
Tweaks into AccountingStart documentation.
...
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
2018-03-08 12:28:34 +01:00
Nick Mathewson
699bb803ba
Fix a crash bug when testing reachability
...
Fixes bug 25415; bugfix on 0.3.3.2-alpha.
2018-03-04 10:31:17 -05:00
Nick Mathewson
e5a990fc5a
tweak changelog for 4187
2018-03-03 12:02:45 -05:00
Nick Mathewson
df9d2de441
Merge remote-tracking branch 'fristonio/ticket4187'
2018-03-03 12:02:30 -05:00
Nick Mathewson
338dbdab93
Merge branch 'maint-0.3.3'
2018-03-03 11:59:27 -05:00
Nick Mathewson
ccf0f77da1
changes file for 25378
2018-03-03 11:58:22 -05:00
Alexander Færøy
59a7b00384
Update tor.1.txt with the currently available log domains.
...
See: https://bugs.torproject.org/25378
2018-03-03 11:58:14 -05:00
Nick Mathewson
62482ea279
Merge branch 'maint-0.3.3'
2018-03-03 11:53:05 -05:00
Nick Mathewson
cc7de9ce1d
Merge branch 'ticket23814' into maint-0.3.3
2018-03-03 11:53:01 -05:00
Nick Mathewson
27c3a1d657
Merge branch 'maint-0.3.3'
...
"ours" merge to avoid version bump.
2018-03-03 11:34:02 -05:00
Nick Mathewson
aec505a310
bump to 0.3.3.3-alpha-dev
2018-03-03 11:33:56 -05:00
Nick Mathewson
35d945a646
Merge branch 'maint-0.3.2' into maint-0.3.3
...
"ours" merge to avoid version bump.
2018-03-03 11:33:33 -05:00
Nick Mathewson
0026d1a673
bump version to 0.3.2.10-dev
2018-03-03 11:33:27 -05:00
Nick Mathewson
d81a5231ee
Merge branch 'maint-0.3.1' into maint-0.3.2
...
"ours" merge to avoid version bump
2018-03-03 11:33:02 -05:00
Nick Mathewson
0aa794d309
version bump to 0.3.1.10-dev
2018-03-03 11:32:51 -05:00
Nick Mathewson
2e2aacca2a
Merge branch 'maint-0.2.9' into maint-0.3.1
...
"ours" merge to avoid version bump.
2018-03-03 11:32:29 -05:00
Nick Mathewson
9eb6f9d3c8
Bump version to 0.2.9.15-dev
2018-03-03 11:32:16 -05:00
Nick Mathewson
9a14f1ef64
Copy changelog and releasenotes entries from today's releases.
2018-03-03 07:58:12 -05:00
Nick Mathewson
9f35dd9e8a
Merge branch 'master' of git-rw.torproject.org:/tor
2018-03-03 07:57:30 -05:00
Roger Dingledine
2bd23cebf3
resolve a weird binary character that crept into the man page
2018-03-02 19:21:45 -05:00
Roger Dingledine
b46bda9d18
get rid of extraneous punctuation in man page
2018-03-02 19:07:04 -05:00
Roger Dingledine
6db6a00671
fix a confusing "0 0" in the man page
...
feel free to backport this commit back to 0.3.2.x if you like it
2018-03-02 18:58:29 -05:00
Nick Mathewson
6f1fe29e8d
Merge branch 'maint-0.3.3'
...
"ours" to avoid version bump.
2018-03-01 16:44:18 -05:00
Nick Mathewson
15f6201a5b
increment to 0.3.3.3-alpha
2018-03-01 16:44:07 -05:00
Nick Mathewson
e0903ebd88
Merge branch 'maint-0.3.2' into maint-0.3.3
...
"ours" to avoid version bump.
2018-03-01 16:43:42 -05:00
Nick Mathewson
1ec386561e
version bump to 0.3.2.10
2018-03-01 16:43:35 -05:00
Nick Mathewson
5b0ae08400
Merge branch 'maint-0.3.1' into maint-0.3.2
...
"ours" to avoid version bump.
2018-03-01 16:43:10 -05:00
