|  Nick Mathewson | 52d7af631c
							
							Merge branch 'trove-2017-010_029' into maint-0.2.9 | 8 years ago | 
				
					
						|  Nick Mathewson | f49876d66e
							
							Merge branch 'trove-2017-012_025' into maint-0.2.5 | 8 years ago | 
				
					
						|  Nick Mathewson | 08ce39fb0f
							
							Merge branch 'trove-2017-011_025' into maint-0.2.5 | 8 years ago | 
				
					
						|  Nick Mathewson | a6a0c7a4ec
							
							Merge branch 'trove-2017-009_025' into maint-0.2.5 | 8 years ago | 
				
					
						|  Nick Mathewson | 75509dc827
							
							Fix changes file | 8 years ago | 
				
					
						|  Nick Mathewson | 500f04a74e
							
							Merge branch 'maint-0.3.0' into maint-0.3.1 | 8 years ago | 
				
					
						|  Nick Mathewson | 766d0a2d98
							
							Merge branch 'maint-0.2.9' into maint-0.3.0 | 8 years ago | 
				
					
						|  Nick Mathewson | 072e194a15
							
							Merge branch 'bug21394_029' into maint-0.2.9 | 8 years ago | 
				
					
						|  David Goulet | 6ab07419c8
							
							Use local descriptor object to exclude self in path selection | 8 years ago | 
				
					
						|  David Goulet | 91cee3c9e7
							
							Guard: Don't pick ourselves as a possible Guard | 8 years ago | 
				
					
						|  David Goulet | 3030741b5d
							
							hs-v2: Remove any expiring intro from the retry list | 8 years ago | 
				
					
						|  Nick Mathewson | 1880a6a88e
							
							Avoid asking for passphrase on junky PEM input | 8 years ago | 
				
					
						|  Nick Mathewson | 2c0487ecfb
							
							Handle NULL input to protover_compute_for_old_tor() | 8 years ago | 
				
					
						|  Nick Mathewson | 2834cc9c18
							
							Fix length of replaycache-checked data. | 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 | 7358559524
							
							Merge branch 'maint-0.3.0' into maint-0.3.1 | 8 years ago | 
				
					
						|  Nick Mathewson | 2d849716df
							
							Merge branch 'maint-0.2.9' into maint-0.3.0 | 8 years ago | 
				
					
						|  Nick Mathewson | 53c3174ee4
							
							Merge branch 'maint-0.2.8' into maint-0.2.9 | 8 years ago | 
				
					
						|  Nick Mathewson | d388f9d879
							
							Merge branch 'maint-0.2.5' into maint-0.2.8 | 8 years ago | 
				
					
						|  Nick Mathewson | 831d3b794d
							
							Merge branch 'ticket18329_minimal_025' into maint-0.2.5 | 8 years ago | 
				
					
						|  Nick Mathewson | 9f2efd02a1
							
							Minimal implementation of bridge-distribution-request | 8 years ago | 
				
					
						|  Nick Mathewson | 1d5e693b63
							
							Merge branch 'maint-0.3.0' into maint-0.3.1 | 8 years ago | 
				
					
						|  Nick Mathewson | 50fbede459
							
							Merge branch 'maint-0.2.9' into maint-0.3.0 | 8 years ago | 
				
					
						|  Nick Mathewson | 1b9bb2c847
							
							Merge branch 'bug22895_027' into maint-0.2.9 | 8 years ago | 
				
					
						|  Nick Mathewson | 562b3c9678
							
							Merge branch 'maint-0.3.0' into maint-0.3.1 | 8 years ago | 
				
					
						|  Nick Mathewson | fea5c8a015
							
							Merge branch 'maint-0.2.9' into maint-0.3.0 | 8 years ago | 
				
					
						|  Nick Mathewson | 543fd89fb7
							
							Merge branch 'maint-0.2.8' into maint-0.2.9 | 8 years ago |