 Nick Mathewson
|
6a9c3d6e3a
Merge branch 'maint-0.3.2'
|
8 years ago |
|
Nick Mathewson
|
9b44bb49b4
Merge branch 'bug24050_029_squashed' into maint-0.3.2
|
8 years ago |
|
Nick Mathewson
|
a94c486102
Make the cache_ipv4_answers default become 0 again, for real.
|
8 years ago |
|
Nick Mathewson
|
722c64fc23
Merge branch 'maint-0.3.2'
|
8 years ago |
|
Nick Mathewson
|
4bb287aa39
Merge branch 'maint-0.3.1' into maint-0.3.2
|
8 years ago |
|
Nick Mathewson
|
703ab95e9f
Merge branch 'maint-0.3.0' into maint-0.3.1
|
8 years ago |
|
Nick Mathewson
|
b1c4ab0bec
Merge branch 'maint-0.2.9' into maint-0.3.0
|
8 years ago |
|
Nick Mathewson
|
30b3229252
Merge branch 'maint-0.2.8' into maint-0.2.9
|
8 years ago |
 Sebastian Hahn
|
25c90230be
Add bastet's ipv6 address
|
8 years ago |
|
Nick Mathewson
|
bf882b0373
re-run ./scripts/maint/annotate_ifdef_directives
|
8 years ago |
|
Nick Mathewson
|
bf8a7201ce
Remove remove_file_if_very_old() -- nothing calls it.
|
8 years ago |
|
Nick Mathewson
|
ce3d5da0d2
Merge branch 'maint-0.3.2'
|
8 years ago |
|
Nick Mathewson
|
40c64f45f0
Re-remove AllowDotExit deprecation.
|
8 years ago |
|
Nick Mathewson
|
9f650b24e9
Merge branch 'maint-0.3.2'
|
8 years ago |
|
Sebastian Hahn
|
d3fee8b823
ClientDNSRejectInternalAddresses in non-default networks
|
8 years ago |
|
Sebastian Hahn
|
e491c05f96
Undo deprecation of ClientDNSRejectInternalAddresses
|
8 years ago |
|
Sebastian Hahn
|
5a46074e55
Revert "Make ClientDNSRejectInternalAddresses testing-only."
|
8 years ago |
 Roger Dingledine
|
7700b99fe6
easy typos while reviewing commits
|
8 years ago |
|
Nick Mathewson
|
cd606d5ad3
Merge remote-tracking branch 'public/owning_control_fd'
|
8 years ago |
|
Nick Mathewson
|
ef25f957e7
Merge branch 'tor_api_squashed'
|
8 years ago |
|
Nick Mathewson
|
b76a161e01
Merge branch 'fix-torrcd-sandbox-22605v2'
|
8 years ago |
 Neel Chauhan
|
b70e11ef6b
Add code for letting user select Reduced Exit Policy
|
8 years ago |
|
Nick Mathewson
|
5a21b27083
Merge branch 'maint-0.3.0' into maint-0.3.1
|
8 years ago |
|
Nick Mathewson
|
f2e23d38ab
Merge branch 'maint-0.2.9' into maint-0.3.0
|
8 years ago |
|
Nick Mathewson
|
7c59c751b0
Merge branch 'maint-0.3.1' into maint-0.3.2
|
8 years ago |
|
Nick Mathewson
|
cf98ca715c
Merge branch 'maint-0.3.2'
|
8 years ago |
|
Nick Mathewson
|
04d4786cc4
Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9
|
8 years ago |
|
Nick Mathewson
|
30a681553f
Merge remote-tracking branch 'public/exit_carefully'
|
8 years ago |
|
Nick Mathewson
|
8d908b961f
Merge branch 'maint-0.3.2'
|
8 years ago |
|
Nick Mathewson
|
594cf92498
Merge branch 'feature18329_029_squashed' into maint-0.3.2
|
8 years ago |
