 Nick Mathewson
|
035a35178c
|
Fold in changelog entry.
|
2018-06-12 09:47:25 -04:00 |
|
|
Nick Mathewson
|
ce959b9424
|
Merge branch 'maint-0.3.3' into release-0.3.3
|
2018-06-12 09:44:17 -04:00 |
|
|
Nick Mathewson
|
eaa359650c
|
Merge branch 'maint-0.3.2' into maint-0.3.3
|
2018-06-12 09:44:17 -04:00 |
|
|
Nick Mathewson
|
53513e4bfe
|
Merge branch 'maint-0.3.1' into maint-0.3.2
|
2018-06-12 09:44:17 -04:00 |
|
|
Nick Mathewson
|
16381b579e
|
Merge branch 'maint-0.2.9' into maint-0.3.1
|
2018-06-12 09:44:17 -04:00 |
|
 Linus Nordberg
|
2ef448da2f
|
Add a changelog entry.
|
2018-06-12 09:44:01 -04:00 |
|
|
Nick Mathewson
|
7b7b817c3e
|
changelog for 0.3.3.7
|
2018-06-12 08:56:05 -04:00 |
|
|
Nick Mathewson
|
5d8a927aa3
|
Merge branch 'maint-0.3.1' into maint-0.3.2
|
2018-06-12 08:18:56 -04:00 |
|
|
Nick Mathewson
|
7fff99110b
|
Merge branch 'maint-0.3.2' into maint-0.3.3
|
2018-06-12 08:18:56 -04:00 |
|
|
Nick Mathewson
|
9ff769c492
|
Merge branch 'maint-0.3.3' into release-0.3.3
|
2018-06-12 08:18:56 -04:00 |
|
|
Nick Mathewson
|
d84581a3e6
|
Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1
|
2018-06-12 08:18:53 -04:00 |
|
|
Nick Mathewson
|
74ac463e7f
|
Merge branch 'maint-0.3.1' into maint-0.3.2
|
2018-06-12 08:11:20 -04:00 |
|
|
Nick Mathewson
|
6dca180ae9
|
Merge branch 'maint-0.3.2' into maint-0.3.3
|
2018-06-12 08:11:20 -04:00 |
|
|
Nick Mathewson
|
3cca9a103d
|
Merge branch 'maint-0.3.3' into release-0.3.3
|
2018-06-12 08:11:20 -04:00 |
|
|
Nick Mathewson
|
19f3868523
|
Merge branch 'maint-0.2.9' into maint-0.3.1
|
2018-06-12 08:11:19 -04:00 |
|
 Karsten Loesing
|
ae540569ce
|
Update geoip and geoip6 to the June 7 2018 database.
|
2018-06-11 21:58:55 +02:00 |
|
|
Nick Mathewson
|
a141127435
|
Merge branch 'maint-0.3.2' into maint-0.3.3
|
2018-06-08 10:12:57 -04:00 |
|
|
Nick Mathewson
|
79c56a6e31
|
Merge branch 'maint-0.3.3' into release-0.3.3
|
2018-06-08 10:12:57 -04:00 |
|
|
Nick Mathewson
|
dd63033fcb
|
Merge branch 'maint-0.3.1' into maint-0.3.2
|
2018-06-08 10:11:57 -04:00 |
|
|
Nick Mathewson
|
1ef8023e00
|
Merge branch 'maint-0.2.9' into maint-0.3.1
|
2018-06-08 10:11:57 -04:00 |
|
 rl1987
|
719b5c1d27
|
Avoid out-of-bounds smartlist access in protover_compute_vote()
and contract_protocol_list()
|
2018-06-08 10:11:32 -04:00 |
|
 teor
|
8366be3b51
|
Silence unused-const-variable warnings in zstd.h on some gcc versions
Fixes bug 26272; bugfix on 0.3.1.1-alpha.
|
2018-06-02 14:11:04 -07:00 |
|
|
Nick Mathewson
|
0c9d617762
|
Merge branch 'maint-0.3.3' into release-0.3.3
|
2018-06-02 10:42:06 -07:00 |
|
|
Nick Mathewson
|
f15f90e2ca
|
Merge branch 'bug26121-033-squashed' into maint-0.3.3
|
2018-06-02 10:36:44 -07:00 |
|
 Mike Perry
|
fe5764012a
|
Bug 26121: Improve BUILDTIMEOUT_SET accuracy.
We were miscounting the total number of circuits for the TIMEOUT_RATE and
CLOSE_RATE fields of this event.
|
2018-06-02 10:36:36 -07:00 |
|
|
Nick Mathewson
|
db9ca07c46
|
Merge branch 'maint-0.3.3' into release-0.3.3
|
2018-05-27 10:04:42 -04:00 |
|
|
Nick Mathewson
|
fa1890e97f
|
Merge remote-tracking branch 'public/bug25691_033_again_squashed' into maint-0.3.3
|
2018-05-27 10:03:11 -04:00 |
|
|
Nick Mathewson
|
3f3739c6e0
|
Merge branch 'maint-0.3.1' into maint-0.3.2
|
2018-05-24 09:40:06 -04:00 |
|
|
Nick Mathewson
|
f48fb8a720
|
Merge branch 'maint-0.2.9' into maint-0.3.1
|
2018-05-24 09:40:06 -04:00 |
|
|
Nick Mathewson
|
c8dad04924
|
Merge branch 'maint-0.3.3' into release-0.3.3
|
2018-05-24 09:40:06 -04:00 |
|
|
Nick Mathewson
|
c000763f1e
|
Merge branch 'bug26116_033' into maint-0.3.3
|
2018-05-24 09:40:00 -04:00 |
|
|
Nick Mathewson
|
c380562aed
|
Merge branch 'bug26116_029' into maint-0.2.9
|
2018-05-24 09:39:46 -04:00 |
|
|
Nick Mathewson
|
b6a88173bb
|
add TROVE-2018-005 to changelog and releasenotes
|
2018-05-22 12:37:49 -04:00 |
|
|
Nick Mathewson
|
f177ec2142
|
Merge branch 'maint-0.3.3' into release-0.3.3
|
2018-05-22 12:33:54 -04:00 |
|
|
Nick Mathewson
|
a3a8d80beb
|
Merge branch 'trove-2018-005_032' into trove-2018-005_033
|
2018-05-22 12:27:15 -04:00 |
|
|
Nick Mathewson
|
d2bc019053
|
changes file for TROVE-2018-005
|
2018-05-22 12:26:23 -04:00 |
|
|
Nick Mathewson
|
2b2634339b
|
Move bug25145 entry into ChangeLog
(It doesn't go into ReleaseNotes, since it's a bugfix on 0.3.3.2-alpha)
|
2018-05-22 10:20:15 -04:00 |
|
|
Nick Mathewson
|
c91c4e9bb6
|
Merge branch 'maint-0.3.3' into release-0.3.3
|
2018-05-22 08:35:41 -04:00 |
|
|
Nick Mathewson
|
3d12663243
|
Fix a crash bug when testing reachability
Fixes bug 25415; bugfix on 0.3.3.2-alpha.
|
2018-05-22 08:35:37 -04:00 |
|
|
Nick Mathewson
|
d0def59108
|
Begin work on a ChangeLog for 0.3.3.6
|
2018-05-17 12:59:33 -04:00 |
|
|
Nick Mathewson
|
3c4353179f
|
Merge branch 'maint-0.3.2' into maint-0.3.3
|
2018-05-16 12:11:45 -04:00 |
|
|
Nick Mathewson
|
8340f641c3
|
Merge branch 'maint-0.3.1' into maint-0.3.2
|
2018-05-16 12:11:45 -04:00 |
|
|
Nick Mathewson
|
d3a972561a
|
Merge branch 'maint-0.2.9' into maint-0.3.1
|
2018-05-16 12:11:45 -04:00 |
|
|
Nick Mathewson
|
ad5b4c4085
|
Merge branch 'maint-0.3.3' into release-0.3.3
|
2018-05-16 12:11:45 -04:00 |
|
|
Nick Mathewson
|
d1e4ffc710
|
Merge branch 'bug26072_029' into maint-0.2.9
|
2018-05-16 12:11:40 -04:00 |
|
|
Nick Mathewson
|
ddc3eb20b7
|
Merge branch 'bug26116_029' into bug26116_033
|
2018-05-16 11:43:53 -04:00 |
|
|
Nick Mathewson
|
881f7157f6
|
Return -1 from our PEM password callback
Apparently, contrary to its documentation, this is how OpenSSL now
wants us to report an error.
Fixes bug 26116; bugfix on 0.2.5.16.
|
2018-05-16 11:39:42 -04:00 |
|
|
Nick Mathewson
|
ca63a66604
|
Merge branch 'maint-0.3.3' into release-0.3.3
|
2018-05-15 09:32:45 -04:00 |
|
|
Nick Mathewson
|
6acbd4c112
|
Merge branch 'maint-0.3.2' into maint-0.3.3
|
2018-05-15 09:32:44 -04:00 |
|
|
Nick Mathewson
|
4aa3d511b2
|
Merge branch 'maint-0.3.1' into maint-0.3.2
|
2018-05-15 09:32:44 -04:00 |
|